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

adaptivedemux: do not flush the input pad

Browse source 
gst_adaptive_demux_stream_clear_eos_and_flush_state() function will do
all the necessary cleaning.

https://bugzilla.gnome.org/show_bug.cgi?id=757951
This commit is contained in:
Florin Apostol 2015-11-11 17:24:33 +00:00 committed by Thiago Santos
parent 3fd44b2dde
commit d92f11b819
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2427,24 +2427,11 @@ gst_adaptive_demux_stream_download_uri (GstAdaptiveDemux * demux,
ret = GST_FLOW_CUSTOM_ERROR;
}
/* flush the proxypads so that the EOS state is reset */
gst_pad_push_event (stream->src_srcpad, gst_event_new_flush_start ());
/* sending flush stop event will serialiase on stream->src_srcpad.
* But the _src_chain function will first get the pad lock and then the
* manifest lock, so we cannot hold the manifest lock here while
* we will try to get the pad lock (taking locks in reversing order
* will lead to deadlock)
*
* In conclusion, we need to release the manifest lock before flushing
*/
GST_MANIFEST_UNLOCK (demux);
gst_pad_push_event (stream->src_srcpad, gst_event_new_flush_stop (TRUE));
/* changing src element state might try to join the streaming thread, so
* we must not hold the manifest lock.
*/
GST_MANIFEST_UNLOCK (demux);
gst_element_set_state (stream->src, GST_STATE_READY);
GST_MANIFEST_LOCK (demux);