mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: add replaced flag to not error out on bitrate change

Browse source 
When switching bitrates we set the old streams as cancelled, but it
could also be confused with a cancel due to other reasons (as an error)
and it would lead the element to stop the pipeline mistankely. This
would happen when the stream being replaced was waiting for a manifest
update on live. Ss make it sure that we are stopping for switching
bitrates to avoid erroring out.

https://bugzilla.gnome.org/show_bug.cgi?id=789457
This commit is contained in:
Thiago Santos 2017-10-14 13:22:18 -07:00
parent ee2d4c955f
commit c2d34d1e44
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1266,6 +1266,7 @@ gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux)
gst_task_stop (stream->download_task); gst_task_stop (stream->download_task);
g_mutex_lock (&stream->fragment_download_lock); g_mutex_lock (&stream->fragment_download_lock);
stream->cancelled = TRUE; stream->cancelled = TRUE;
stream->replaced = TRUE;
g_cond_signal (&stream->fragment_download_cond); g_cond_signal (&stream->fragment_download_cond);
g_mutex_unlock (&stream->fragment_download_lock); g_mutex_unlock (&stream->fragment_download_lock);
} }
@ -2010,6 +2011,7 @@ gst_adaptive_demux_start_tasks (GstAdaptiveDemux * demux,
if (!start_preroll_streams) { if (!start_preroll_streams) {
g_mutex_lock (&stream->fragment_download_lock); g_mutex_lock (&stream->fragment_download_lock);
stream->cancelled = FALSE; stream->cancelled = FALSE;
stream->replaced = FALSE;
g_mutex_unlock (&stream->fragment_download_lock); g_mutex_unlock (&stream->fragment_download_lock);
} }
@ -3778,6 +3780,9 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
goto end; goto end;
} }
gst_task_stop (stream->download_task); gst_task_stop (stream->download_task);
if (stream->replaced) {
goto end;
}
} else { } else {
gst_task_stop (stream->download_task); gst_task_stop (stream->download_task);
if (gst_adaptive_demux_combine_flows (demux) == GST_FLOW_EOS) { if (gst_adaptive_demux_combine_flows (demux) == GST_FLOW_EOS) {

3
gst-libs/gst/adaptivedemux/gstadaptivedemux.h
View file

@ -160,7 +160,8 @@ struct _GstAdaptiveDemuxStream
GMutex fragment_download_lock; GMutex fragment_download_lock;
GCond fragment_download_cond; GCond fragment_download_cond;
gboolean download_finished; /* protected by fragment_download_lock */ gboolean download_finished; /* protected by fragment_download_lock */
gboolean cancelled; /* protected by fragment_download_lock */ gboolean cancelled; /* protected by fragment_download_lock */
gboolean replaced; /* replaced in a bitrate switch (used with cancelled) */
gboolean src_at_ready; /* protected by fragment_download_lock */ gboolean src_at_ready; /* protected by fragment_download_lock */
gboolean starting_fragment; gboolean starting_fragment;
gboolean first_fragment_buffer; gboolean first_fragment_buffer;