mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasesink.c: When the subclass event handler releases the PREROLL_LOCK, we could be in the flushing s...

Browse source 
Original commit message from CVS:
Based on patch by: Jason Zhao <e3423c at motorola dot com>
* libs/gst/base/gstbasesink.c: (gst_base_sink_render_object):
When the subclass event handler releases the PREROLL_LOCK, we could be
in the flushing state and we have to ignore the event. Fixes #548394.
This commit is contained in:
Jason Zhao 2008-08-19 08:52:05 +00:00 committed by Wim Taymans
parent bfd08292ec
commit b981ec6e09
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-08-19 Wim Taymans <wim.taymans@collabora.co.uk>
Based on patch by: Jason Zhao <e3423c at motorola dot com>
* libs/gst/base/gstbasesink.c: (gst_base_sink_render_object):
When the subclass event handler releases the PREROLL_LOCK, we could be
in the flushing state and we have to ignore the event. Fixes #548394.
2008-08-18 Tim-Philipp Müller <tim.muller at collabora co uk> 2008-08-18 Tim-Philipp Müller <tim.muller at collabora co uk>
* tools/gst-launch.1.in: * tools/gst-launch.1.in:

15
libs/gst/base/gstbasesink.c
View file

@ -2108,6 +2108,9 @@ no_timestamp:
} }
} }
/* called before and after calling the render vmethod. It keeps track of how
* much time was spent in the render method and is used to check if we are
* flooded */
static void static void
gst_base_sink_do_render_stats (GstBaseSink * basesink, gboolean start) gst_base_sink_do_render_stats (GstBaseSink * basesink, gboolean start)
{ {
@ -2205,6 +2208,12 @@ gst_base_sink_render_object (GstBaseSink * basesink, GstPad * pad,
if (bclass->event) if (bclass->event)
event_res = bclass->event (basesink, event); event_res = bclass->event (basesink, event);
/* when we get here we could be flushing again when the event handler calls
* _wait_eos() or releases the preroll lock in any other way.
* We have to ignore this object in that case. */
if (G_UNLIKELY (basesink->flushing))
goto flushing;
if (G_LIKELY (event_res)) { if (G_LIKELY (event_res)) {
switch (type) { switch (type) {
case GST_EVENT_EOS: case GST_EVENT_EOS:
@ -2251,6 +2260,12 @@ dropped:
GST_DEBUG_OBJECT (basesink, "buffer late, dropping"); GST_DEBUG_OBJECT (basesink, "buffer late, dropping");
goto done; goto done;
} }
flushing:
{
GST_DEBUG_OBJECT (basesink, "we are flushing, ignore object");
gst_mini_object_unref (obj);
return GST_FLOW_WRONG_STATE;
}
} }
/* with STREAM_LOCK, PREROLL_LOCK /* with STREAM_LOCK, PREROLL_LOCK