mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-25 07:26:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: Store average download time

Browse source 
This will be used to bound the download rate when working in
keyframe-only trick mode
This commit is contained in:
Edward Hervey 2017-01-11 17:11:27 +01:00 committed by Edward Hervey
parent be6465fc35
commit 04224ad440
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/dash/gstdashdemux.c
View file

@ -724,6 +724,8 @@ gst_dash_demux_setup_all_streams (GstDashDemux * demux)
stream->index = i; stream->index = i;
stream->pending_seek_ts = GST_CLOCK_TIME_NONE; stream->pending_seek_ts = GST_CLOCK_TIME_NONE;
stream->sidx_position = GST_CLOCK_TIME_NONE; stream->sidx_position = GST_CLOCK_TIME_NONE;
/* Set a default average keyframe download time of a quarter of a second */
stream->average_download_time = 250 * GST_MSECOND;
if (active_stream->cur_adapt_set && if (active_stream->cur_adapt_set &&
active_stream->cur_adapt_set->RepresentationBase && active_stream->cur_adapt_set->RepresentationBase &&
active_stream->cur_adapt_set->RepresentationBase->ContentProtection) { active_stream->cur_adapt_set->RepresentationBase->ContentProtection) {
@ -1503,6 +1505,29 @@ gst_dash_demux_stream_advance_fragment (GstAdaptiveDemuxStream * stream)
GST_DEBUG_OBJECT (stream->pad, "Advance fragment"); GST_DEBUG_OBJECT (stream->pad, "Advance fragment");
/* Update statistics */
if (dashstream->moof_sync_samples &&
GST_ADAPTIVE_DEMUX_IN_TRICKMODE_KEY_UNITS (dashdemux)) {
if (GST_CLOCK_TIME_IS_VALID (stream->last_download_time)) {
if (GST_CLOCK_TIME_IS_VALID (dashstream->average_download_time)) {
/* We go up more aggresively than we go down */
if (stream->last_download_time > dashstream->average_download_time)
dashstream->average_download_time =
(dashstream->average_download_time +
stream->last_download_time) / 2;
else
dashstream->average_download_time =
(3 * dashstream->average_download_time +
stream->last_download_time) / 4;
} else
dashstream->average_download_time = stream->last_download_time;
GST_DEBUG_OBJECT (stream->pad,
"Download time %" GST_TIME_FORMAT " %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->last_download_time),
GST_TIME_ARGS (dashstream->average_download_time));
}
}
/* If downloading only keyframes, switch to the next one or fall through */ /* If downloading only keyframes, switch to the next one or fall through */
if (dashstream->moof_sync_samples && if (dashstream->moof_sync_samples &&
GST_ADAPTIVE_DEMUX_IN_TRICKMODE_KEY_UNITS (dashdemux)) { GST_ADAPTIVE_DEMUX_IN_TRICKMODE_KEY_UNITS (dashdemux)) {

3
ext/dash/gstdashdemux.h
View file

@ -98,6 +98,9 @@ struct _GstDashDemuxStream
guint64 keyframe_average_size; guint64 keyframe_average_size;
guint64 keyframe_average_distance; guint64 keyframe_average_distance;
gboolean first_sync_sample_after_moof, first_sync_sample_always_after_moof; gboolean first_sync_sample_after_moof, first_sync_sample_always_after_moof;
/* Average keyframe download time (only in trickmode-key-units) */
GstClockTime average_download_time;
}; };
/** /**