FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dashdemux: Implement SIDX tracking based on buffer offset

Browse Source 
This simplifies the code but also removes a bug with tracking of the remaining
size for the initial subfragment: we were not considering the size between the
index and the start of the first moof here.

https://bugzilla.gnome.org/show_bug.cgi?id=764684
This commit is contained in:
Sebastian Dröge 2016-05-27 16:08:09 +03:00
parent 9374643089
commit 91e398ddd6
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/dash/gstdashdemux.c
View File

@ -1096,9 +1096,7 @@ gst_dash_demux_stream_sidx_seek (GstDashDemuxStream * dashstream,
gint idx = sidx->entries_count; gint idx = sidx->entries_count;
/* check whether ts is already past the last element or not */ /* check whether ts is already past the last element or not */
if (sidx->entries[idx - 1].pts + sidx->entries[idx - 1].duration < ts) { if (sidx->entries[idx - 1].pts + sidx->entries[idx - 1].duration >= ts) {
dashstream->sidx_current_remaining = 0;
} else {
GstSearchMode mode = GST_SEARCH_MODE_BEFORE; GstSearchMode mode = GST_SEARCH_MODE_BEFORE;
if ((flags & GST_SEEK_FLAG_SNAP_NEAREST) == GST_SEEK_FLAG_SNAP_NEAREST) { if ((flags & GST_SEEK_FLAG_SNAP_NEAREST) == GST_SEEK_FLAG_SNAP_NEAREST) {
@ -1126,8 +1124,6 @@ gst_dash_demux_stream_sidx_seek (GstDashDemuxStream * dashstream,
ABS (sidx->entries[idx].pts - ts)) ABS (sidx->entries[idx].pts - ts))
idx += 1; idx += 1;
} }
dashstream->sidx_current_remaining = sidx->entries[idx].size;
} }
sidx->entry_index = idx; sidx->entry_index = idx;
@ -1208,9 +1204,6 @@ gst_dash_demux_stream_advance_subfragment (GstAdaptiveDemuxStream * stream)
"Finished fragment: %d", sidx->entry_index, sidx->entries_count, "Finished fragment: %d", sidx->entry_index, sidx->entries_count,
fragment_finished); fragment_finished);
if (!fragment_finished) {
dashstream->sidx_current_remaining = sidx->entries[sidx->entry_index].size;
}
return !fragment_finished; return !fragment_finished;
} }
@ -1719,8 +1712,6 @@ gst_dash_demux_data_received (GstAdaptiveDemux * demux,
} else { } else {
SIDX (dash_stream)->entry_index = dash_stream->sidx_index; SIDX (dash_stream)->entry_index = dash_stream->sidx_index;
} }
dash_stream->sidx_current_remaining =
SIDX_CURRENT_ENTRY (dash_stream)->size;
} else if (consumed < available) { } else if (consumed < available) {
GstBuffer *pending; GstBuffer *pending;
/* we still need to keep some data around for the next parsing round /* we still need to keep some data around for the next parsing round
@ -1742,15 +1733,17 @@ gst_dash_demux_data_received (GstAdaptiveDemux * demux,
&& ((available = && ((available =
gst_adapter_available (dash_stream->sidx_adapter)) > 0)) { gst_adapter_available (dash_stream->sidx_adapter)) > 0)) {
gboolean advance = FALSE; gboolean advance = FALSE;
guint64 sidx_end_offset =
dash_stream->sidx_base_offset +
SIDX_CURRENT_ENTRY (dash_stream)->offset +
SIDX_CURRENT_ENTRY (dash_stream)->size;
if (available < dash_stream->sidx_current_remaining) { if (dash_stream->sidx_current_offset + available < sidx_end_offset) {
buffer = gst_adapter_take_buffer (dash_stream->sidx_adapter, available); buffer = gst_adapter_take_buffer (dash_stream->sidx_adapter, available);
dash_stream->sidx_current_remaining -= available;
} else { } else {
buffer = buffer =
gst_adapter_take_buffer (dash_stream->sidx_adapter, gst_adapter_take_buffer (dash_stream->sidx_adapter,
dash_stream->sidx_current_remaining); sidx_end_offset - dash_stream->sidx_current_offset);
dash_stream->sidx_current_remaining = 0;
advance = TRUE; advance = TRUE;
} }
GST_BUFFER_OFFSET (buffer) = dash_stream->sidx_current_offset; GST_BUFFER_OFFSET (buffer) = dash_stream->sidx_current_offset;

1
ext/dash/gstdashdemux.h
View File

@ -69,7 +69,6 @@ struct _GstDashDemuxStream
/* index parsing */ /* index parsing */
GstAdapter *sidx_adapter; GstAdapter *sidx_adapter;
GstSidxParser sidx_parser; GstSidxParser sidx_parser;
gsize sidx_current_remaining;
gint sidx_index; gint sidx_index;
gint64 sidx_base_offset; gint64 sidx_base_offset;
GstClockTime pending_seek_ts; GstClockTime pending_seek_ts;