mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: Collect average moof and first sync sample sizes

Browse source 
And always request those in the beginning so that ideally we get the moof and
the first sync sample all together with the first HTTP request.

https://bugzilla.gnome.org/show_bug.cgi?id=741104
This commit is contained in:
Sebastian Dröge 2016-08-02 08:47:55 +03:00
parent 7f1f777b92
commit 9c04d1e13c
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ext/dash/gstdashdemux.c
View file

@ -1877,7 +1877,6 @@ gst_dash_demux_need_another_chunk (GstAdaptiveDemuxStream * stream)
/* We're chunked downloading for ISOBMFF in KEY_UNITS mode for the actual /* We're chunked downloading for ISOBMFF in KEY_UNITS mode for the actual
* fragment until we parsed the moof and arrived at the mdat. 8192 is a * fragment until we parsed the moof and arrived at the mdat. 8192 is a
* random guess for the moof size * random guess for the moof size
* TODO: Calculate running average for the moof size and use that instead
*/ */
if (dashstream->is_isobmff if (dashstream->is_isobmff
&& (GST_ADAPTIVE_DEMUX (stream->demux)-> && (GST_ADAPTIVE_DEMUX (stream->demux)->
@ -1887,7 +1886,16 @@ gst_dash_demux_need_another_chunk (GstAdaptiveDemuxStream * stream)
&& dashdemux->allow_trickmode_key_units) { && dashdemux->allow_trickmode_key_units) {
if (dashstream->isobmff_parser.current_fourcc != GST_ISOFF_FOURCC_MDAT) { if (dashstream->isobmff_parser.current_fourcc != GST_ISOFF_FOURCC_MDAT) {
/* Need to download the moof first to know anything */ /* Need to download the moof first to know anything */
stream->fragment.chunk_size = 8192; stream->fragment.chunk_size = 8192;
/* Do we have the first fourcc already or are we in the middle */
if (dashstream->isobmff_parser.current_fourcc == 0) {
stream->fragment.chunk_size += dashstream->moof_average_size;
if (dashstream->first_sync_sample_always_after_moof)
stream->fragment.chunk_size +=
dashstream->first_sync_sample_average_size;
}
} else if (dashstream->moof && dashstream->moof_sync_samples) { } else if (dashstream->moof && dashstream->moof_sync_samples) {
/* Have the moof, either we're done now or we want to download the /* Have the moof, either we're done now or we want to download the
* directly following sync sample */ * directly following sync sample */
@ -1915,7 +1923,9 @@ gst_dash_demux_need_another_chunk (GstAdaptiveDemuxStream * stream)
/* We might've decided that we can't allow key-unit only /* We might've decided that we can't allow key-unit only
* trickmodes while doing chunked downloading. In that case * trickmodes while doing chunked downloading. In that case
* just download from here to the end now */ * just download from here to the end now */
if (dashstream->moof) if (dashstream->moof
&& (GST_ADAPTIVE_DEMUX (stream->demux)->
segment.flags & GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS))
stream->fragment.chunk_size = -1; stream->fragment.chunk_size = -1;
else else
stream->fragment.chunk_size = 0; stream->fragment.chunk_size = 0;
@ -2033,6 +2043,17 @@ gst_dash_demux_parse_isobmff (GstAdaptiveDemux * demux,
dash_stream->isobmff_parser.current_start_offset; dash_stream->isobmff_parser.current_start_offset;
dash_stream->moof_size = size; dash_stream->moof_size = size;
dash_stream->current_sync_sample = -1; dash_stream->current_sync_sample = -1;
if (dash_stream->moof_average_size) {
if (dash_stream->moof_average_size < size)
dash_stream->moof_average_size =
(size * 3 + dash_stream->moof_average_size) / 4;
else
dash_stream->moof_average_size =
(size + dash_stream->moof_average_size + 3) / 4;
} else {
dash_stream->moof_average_size = size;
}
} else { } else {
gst_byte_reader_skip (&reader, size - header_size); gst_byte_reader_skip (&reader, size - header_size);
} }
@ -2249,6 +2270,18 @@ gst_dash_demux_find_sync_samples (GstAdaptiveDemux * demux,
GstDashStreamSyncSample *sync_sample = GstDashStreamSyncSample *sync_sample =
&g_array_index (dash_stream->moof_sync_samples, GstDashStreamSyncSample, &g_array_index (dash_stream->moof_sync_samples, GstDashStreamSyncSample,
0); 0);
guint size = sync_sample->end_offset + 1 - sync_sample->start_offset;
if (dash_stream->first_sync_sample_average_size) {
if (dash_stream->first_sync_sample_average_size < size)
dash_stream->first_sync_sample_average_size =
(size * 3 + dash_stream->first_sync_sample_average_size) / 4;
else
dash_stream->first_sync_sample_average_size =
(size + dash_stream->first_sync_sample_average_size * 3) / 4;
} else {
dash_stream->first_sync_sample_average_size = size;
}
if (dash_stream->moof_offset + dash_stream->moof_size + 8 < if (dash_stream->moof_offset + dash_stream->moof_size + 8 <
sync_sample->start_offset) { sync_sample->start_offset) {

1
ext/dash/gstdashdemux.h
View file

@ -94,6 +94,7 @@ struct _GstDashDemuxStream
GArray *moof_sync_samples; GArray *moof_sync_samples;
guint current_sync_sample; guint current_sync_sample;
guint64 moof_average_size, first_sync_sample_average_size;
gboolean first_sync_sample_after_moof, first_sync_sample_always_after_moof; gboolean first_sync_sample_after_moof, first_sync_sample_always_after_moof;
}; };