mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

adder: do not send too many flush-stop events

Browse source 
GstCollectPads2 now allows us to override the event function,
so we can withhold flush stop events if none are to be sent.

https://bugzilla.gnome.org/show_bug.cgi?id=666379
This commit is contained in:
Vincent Penquerc'h 2011-12-16 17:32:41 +00:00
parent 1da30adc1a
commit 85c10b0b24
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/adder/gstadder.c
View file

@ -141,6 +141,8 @@ static GstFlowReturn gst_adder_do_clip (GstCollectPads2 * pads,
gpointer user_data); gpointer user_data);
static GstFlowReturn gst_adder_collected (GstCollectPads2 * pads, static GstFlowReturn gst_adder_collected (GstCollectPads2 * pads,
gpointer user_data); gpointer user_data);
static gboolean gst_adder_event (GstCollectPads2 * pads, GstCollectData2 * pad,
GstEvent * event, gpointer user_data);
/* non-clipping versions (for float) */ /* non-clipping versions (for float) */
#define MAKE_FUNC_NC(name,type) \ #define MAKE_FUNC_NC(name,type) \
@ -750,16 +752,14 @@ gst_adder_sink_event (GstPad * pad, GstEvent * event)
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
/* we received a flush-stop. The collect_event function will push the /* we received a flush-stop. The collect_event function will call the
* event past our element. We simply forward all flush-stop events, even * gst_adder_event function we have set on the GstCollectPads2, so we
* when no flush-stop was pending, this is required because collectpads2 * have control over whether the event is sent past our element.
* does not provide an API to handle-but-not-forward the flush-stop. * We will only forward it when flush_stop_pending is set, and we will
* We unset the pending flush-stop flag so that we don't send anymore * unset it then.
* flush-stop from the collect function later.
*/ */
GST_COLLECT_PADS2_STREAM_LOCK (adder->collect); GST_COLLECT_PADS2_STREAM_LOCK (adder->collect);
g_atomic_int_set (&adder->new_segment_pending, TRUE); g_atomic_int_set (&adder->new_segment_pending, TRUE);
g_atomic_int_set (&adder->flush_stop_pending, FALSE);
/* Clear pending tags */ /* Clear pending tags */
if (adder->pending_events) { if (adder->pending_events) {
g_list_foreach (adder->pending_events, (GFunc) gst_event_unref, NULL); g_list_foreach (adder->pending_events, (GFunc) gst_event_unref, NULL);
@ -868,6 +868,8 @@ gst_adder_init (GstAdder * adder, GstAdderClass * klass)
GST_DEBUG_FUNCPTR (gst_adder_collected), adder); GST_DEBUG_FUNCPTR (gst_adder_collected), adder);
gst_collect_pads2_set_clip_function (adder->collect, gst_collect_pads2_set_clip_function (adder->collect,
GST_DEBUG_FUNCPTR (gst_adder_do_clip), adder); GST_DEBUG_FUNCPTR (gst_adder_do_clip), adder);
gst_collect_pads2_set_event_function (adder->collect,
GST_DEBUG_FUNCPTR (gst_adder_event), adder);
} }
static void static void
@ -1270,6 +1272,24 @@ eos:
} }
} }
static gboolean
gst_adder_event (GstCollectPads2 * pads, GstCollectData2 * pad,
GstEvent * event, gpointer user_data)
{
GstAdder *adder = GST_ADDER (user_data);
if (GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
if (g_atomic_int_compare_and_exchange (&adder->flush_stop_pending,
TRUE, FALSE)) {
return FALSE;
} else {
gst_event_unref (event);
return TRUE;
}
} else {
return FALSE;
}
}
static GstStateChangeReturn static GstStateChangeReturn
gst_adder_change_state (GstElement * element, GstStateChange transition) gst_adder_change_state (GstElement * element, GstStateChange transition)
{ {