mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-24 01:24:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

adder: correctly adjust to modified collectpads2 event handling

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-04-17 13:48:19 +02:00
parent 94beeb713a
commit b1a90e43c8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/adder/gstadder.c
View file

@ -778,7 +778,7 @@ gst_adder_sink_event (GstCollectPads2 * pads, GstCollectData2 * pad,
GstEvent * event, gpointer user_data) GstEvent * event, gpointer user_data)
{ {
GstAdder *adder = GST_ADDER (user_data); GstAdder *adder = GST_ADDER (user_data);
gboolean res = FALSE, discard = FALSE; gboolean res = TRUE, discard = FALSE;
GST_DEBUG_OBJECT (pad->pad, "Got %s event on sink pad", GST_DEBUG_OBJECT (pad->pad, "Got %s event on sink pad",
GST_EVENT_TYPE_NAME (event)); GST_EVENT_TYPE_NAME (event));
@ -815,7 +815,7 @@ gst_adder_sink_event (GstCollectPads2 * pads, GstCollectData2 * pad,
case GST_EVENT_TAG: case GST_EVENT_TAG:
/* collect tags here so we can push them out when we collect data */ /* collect tags here so we can push them out when we collect data */
adder->pending_events = g_list_append (adder->pending_events, event); adder->pending_events = g_list_append (adder->pending_events, event);
discard = TRUE; event = NULL;
break; break;
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:
if (g_atomic_int_compare_and_exchange (&adder->wait_for_new_segment, if (g_atomic_int_compare_and_exchange (&adder->wait_for_new_segment,