mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 05:35:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: Don't switch streams and expose pads while downloading.

Browse source 
If other stream fragments are still downloading but new streams
have been scheduled, don't expose them yet - wait until the last
one finishes. Otherwise, we can cancel a partially downloaded
auxilliary stream and cause a gap.
This commit is contained in:
Jan Schmidt 2016-07-13 23:02:10 +10:00
parent 62ca319927
commit 963a273f61
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -3352,13 +3352,30 @@ gst_adaptive_demux_stream_advance_fragment_unlocked (GstAdaptiveDemux * demux,
/* the subclass might want to switch pads */
if (G_UNLIKELY (demux->next_streams)) {
GList *iter;
gboolean can_expose = TRUE;
gst_task_stop (stream->download_task);
/* TODO only allow switching streams if other downloads are not ongoing */
GST_DEBUG_OBJECT (demux, "Subclass wants new pads "
"to do bitrate switching");
gst_adaptive_demux_expose_streams (demux, FALSE);
gst_adaptive_demux_start_tasks (demux);
g_mutex_lock (&stream->fragment_download_lock);
stream->cancelled = TRUE;
g_cond_signal (&stream->fragment_download_cond);
g_mutex_unlock (&stream->fragment_download_lock);
ret = GST_FLOW_EOS;
for (iter = demux->streams; iter; iter = g_list_next (iter)) {
/* Only expose if all streams are now cancelled (finished downloading) */
can_expose &= (stream->cancelled == TRUE);
}
if (can_expose) {
GST_DEBUG_OBJECT (demux, "Subclass wants new pads "
"to do bitrate switching");
gst_adaptive_demux_expose_streams (demux, FALSE);
gst_adaptive_demux_start_tasks (demux);
} else {
GST_LOG_OBJECT (demux, "Not switching yet - ongoing downloads");
}
}
}