From 68274949197be739ff3b51f9e4e092e002055324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 17 May 2008 19:39:53 +0000 Subject: [PATCH] gst/interleave/deinterleave.*: Queue events until src pads were added and they can be sent. Otherwise downstream will... Original commit message from CVS: * gst/interleave/deinterleave.c: (gst_deinterleave_finalize), (gst_deinterleave_init), (gst_deinterleave_sink_event), (gst_deinterleave_process), (gst_deinterleave_sink_activate_push): * gst/interleave/deinterleave.h: Queue events until src pads were added and they can be sent. Otherwise downstream will never get the first newsegment event. --- ChangeLog | 9 ++++ common | 2 +- gst/interleave/deinterleave.c | 92 +++++++++++++++++++++++++++++++++++ gst/interleave/deinterleave.h | 2 + 4 files changed, 104 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e866440af4..c2acd67a91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-05-17 Sebastian Dröge + + * gst/interleave/deinterleave.c: (gst_deinterleave_finalize), + (gst_deinterleave_init), (gst_deinterleave_sink_event), + (gst_deinterleave_process), (gst_deinterleave_sink_activate_push): + * gst/interleave/deinterleave.h: + Queue events until src pads were added and they can be sent. Otherwise + downstream will never get the first newsegment event. + 2008-05-17 Sebastian Dröge * gst/interleave/deinterleave.c: (gst_deinterleave_sink_setcaps), diff --git a/common b/common index 3b3631082d..e365978c48 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 3b3631082d04b426f450810e8836de94e9c5d60a +Subproject commit e365978c480a8fffa4bdb61568fb2cd989d1b197 diff --git a/gst/interleave/deinterleave.c b/gst/interleave/deinterleave.c index ef4e013f8a..5a263a3a96 100644 --- a/gst/interleave/deinterleave.c +++ b/gst/interleave/deinterleave.c @@ -30,6 +30,23 @@ * and passing downstream caps changes upstream there */ +/** + * SECTION:element-deinterleave + * + * + * + * Splits one interleaved multichannel audio stream into many mono audio streams. + * + * Example launch line + * + * + * gst-launch-0.10 filesrc location=/path/to/file.mp3 ! decodebin ! audioconvert ! "audio/x-raw-int,channels=2 ! deinterleave name=d d.src0 ! queue ! audioconvert ! vorbisenc ! oggmux ! filesink location=channel1.ogg d.src1 ! queue ! audioconvert ! vorbisenc ! oggmux ! filesink location=channel2.ogg + * + * Decodes an MP3 file and encodes the left and right channel into a separate + * + * + */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -111,6 +128,7 @@ static gboolean gst_deinterleave_sink_setcaps (GstPad * pad, GstCaps * caps); static GstCaps *gst_deinterleave_getcaps (GstPad * pad); static gboolean gst_deinterleave_sink_activate_push (GstPad * pad, gboolean active); +static gboolean gst_deinterleave_sink_event (GstPad * pad, GstEvent * event); static void gst_deinterleave_finalize (GObject * obj) @@ -122,6 +140,12 @@ gst_deinterleave_finalize (GObject * obj) self->pos = NULL; } + if (self->pending_events) { + g_list_foreach (self->pending_events, (GFunc) gst_mini_object_unref, NULL); + g_list_free (self->pending_events); + self->pending_events = NULL; + } + G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -169,6 +193,8 @@ gst_deinterleave_init (GstDeinterleave * self, GstDeinterleaveClass * klass) gst_pad_set_getcaps_function (self->sink, gst_deinterleave_getcaps); gst_pad_set_activatepush_function (self->sink, GST_DEBUG_FUNCPTR (gst_deinterleave_sink_activate_push)); + gst_pad_set_event_function (self->sink, + GST_DEBUG_FUNCPTR (gst_deinterleave_sink_event)); gst_element_add_pad (GST_ELEMENT (self), self->sink); } @@ -486,6 +512,42 @@ gst_deinterleave_getcaps (GstPad * pad) return ret; } +static gboolean +gst_deinterleave_sink_event (GstPad * pad, GstEvent * event) +{ + GstDeinterleave *self = GST_DEINTERLEAVE (gst_pad_get_parent (pad)); + gboolean ret; + + GST_DEBUG ("Got %s event on pad %s:%s", GST_EVENT_TYPE_NAME (event), + GST_DEBUG_PAD_NAME (pad)); + + /* Send FLUSH_STOP, FLUSH_START and EOS immediately, no matter if + * we have src pads already or not. Queue all other events and + * push them after we have src pads + */ + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_FLUSH_STOP: + case GST_EVENT_FLUSH_START: + case GST_EVENT_EOS: + ret = gst_pad_event_default (pad, event); + break; + default: + if (self->srcpads) { + ret = gst_pad_event_default (pad, event); + } else { + GST_OBJECT_LOCK (self); + self->pending_events = g_list_append (self->pending_events, event); + GST_OBJECT_UNLOCK (self); + ret = TRUE; + } + break; + } + + gst_object_unref (self); + + return ret; +} + static GstFlowReturn gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf) { @@ -499,6 +561,27 @@ gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf) GstBuffer **buffers_out = g_new0 (GstBuffer *, channels); guint8 *in, *out; + /* Send any pending events to all src pads */ + GST_OBJECT_LOCK (self); + if (self->pending_events) { + GList *events; + GstEvent *event; + + GST_DEBUG_OBJECT (self, "Sending pending events to all src pads"); + + for (events = self->pending_events; events != NULL; events = events->next) { + event = GST_EVENT (events->data); + + for (srcs = self->srcpads; srcs != NULL; srcs = srcs->next) + gst_pad_push_event (GST_PAD (srcs->data), gst_event_ref (event)); + gst_event_unref (event); + } + + g_list_free (self->pending_events); + self->pending_events = NULL; + } + GST_OBJECT_UNLOCK (self); + /* Allocate buffers */ for (srcs = self->srcpads, i = 0; srcs; srcs = srcs->next, i++) { GstPad *pad = (GstPad *) srcs->data; @@ -528,6 +611,8 @@ gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf) /* Return NOT_LINKED if no pad was linked */ if (!buffers_allocated) { + GST_WARNING_OBJECT (self, + "Couldn't allocate any buffers because no pad was linked"); ret = GST_FLOW_NOT_LINKED; goto done; } @@ -631,6 +716,13 @@ gst_deinterleave_sink_activate_push (GstPad * pad, gboolean active) self->channels = 0; self->width = 0; self->func = NULL; + + if (self->pending_events) { + g_list_foreach (self->pending_events, (GFunc) gst_mini_object_unref, + NULL); + g_list_free (self->pending_events); + self->pending_events = NULL; + } } gst_object_unref (self); diff --git a/gst/interleave/deinterleave.h b/gst/interleave/deinterleave.h index 4a1c95789d..c13f7644f5 100644 --- a/gst/interleave/deinterleave.h +++ b/gst/interleave/deinterleave.h @@ -58,6 +58,8 @@ struct _GstDeinterleave gint width; GstDeinterleaveFunc func; + + GList *pending_events; }; struct _GstDeinterleaveClass