FCL/sf/mw/gstreamer: comparison gstreamer_core/plugins/elements/gsttee.c

equal deleted inserted replaced

-:567bb019e3e3
+:7e817e7e631c
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:element-tee
+* @short_description: 1-to-N pipe fitting
 * @see_also: #GstIdentity
 *
 * Split data to multiple pads.
 */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
+#ifdef __SYMBIAN32__
+#include <gst_global.h>
+#endif
 #include "gsttee.h"
 #include <string.h>
+#ifdef __SYMBIAN32__
+#include <glib_global.h>
+#include <gobject_global.h>
+#endif
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
 GST_PAD_SINK,
 GST_PAD_ALWAYS,
 GST_STATIC_CAPS_ANY);
 type = g_enum_register_static ("GstTeePullMode", data);
 }
 return type;
 }
-/* lock to protect request pads from being removed while downstream */
-#define GST_TEE_DYN_LOCK(tee) g_mutex_lock ((tee)->dyn_lock)
-#define GST_TEE_DYN_UNLOCK(tee) g_mutex_unlock ((tee)->dyn_lock)
 #define DEFAULT_PROP_NUM_SRC_PADS	0
 #define DEFAULT_PROP_HAS_SINK_LOOP	FALSE
 #define DEFAULT_PROP_HAS_CHAIN		TRUE
 #define DEFAULT_PROP_SILENT		TRUE
 #define DEFAULT_PROP_LAST_MESSAGE	NULL
 PROP_HAS_SINK_LOOP,
 PROP_HAS_CHAIN,
 PROP_SILENT,
 PROP_LAST_MESSAGE,
 PROP_PULL_MODE,
-PROP_ALLOC_PAD,
 };
 static GstStaticPadTemplate tee_src_template = GST_STATIC_PAD_TEMPLATE ("src%d",
 GST_PAD_SRC,
 GST_PAD_REQUEST,
 typedef struct
 {
 gboolean pushed;
 GstFlowReturn result;
-gboolean removed;
 } PushData;
 static GstPad *gst_tee_request_new_pad (GstElement * element,
 GstPadTemplate * temp, const gchar * unused);
 static void gst_tee_release_pad (GstElement * element, GstPad * pad);
 const GValue * value, GParamSpec * pspec);
 static void gst_tee_get_property (GObject * object, guint prop_id,
 GValue * value, GParamSpec * pspec);
 static GstFlowReturn gst_tee_chain (GstPad * pad, GstBuffer * buffer);
-static GstFlowReturn gst_tee_chain_list (GstPad * pad, GstBufferList * list);
 static GstFlowReturn gst_tee_buffer_alloc (GstPad * pad, guint64 offset,
 guint size, GstCaps * caps, GstBuffer ** buf);
 static gboolean gst_tee_sink_activate_push (GstPad * pad, gboolean active);
 static gboolean gst_tee_src_check_get_range (GstPad * pad);
 static gboolean gst_tee_src_activate_pull (GstPad * pad, gboolean active);
 tee = GST_TEE (object);
 g_free (tee->last_message);
-g_mutex_free (tee->dyn_lock);
 G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 static void
 gst_tee_class_init (GstTeeClass * klass)
 gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_tee_get_property);
 g_object_class_install_property (gobject_class, PROP_NUM_SRC_PADS,
 g_param_spec_int ("num-src-pads", "Num Src Pads",
 "The number of source pads", 0, G_MAXINT, DEFAULT_PROP_NUM_SRC_PADS,
-G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+G_PARAM_READABLE));
 g_object_class_install_property (gobject_class, PROP_HAS_SINK_LOOP,
 g_param_spec_boolean ("has-sink-loop", "Has Sink Loop",
 "If the element should spawn a thread (unimplemented and deprecated)",
-DEFAULT_PROP_HAS_SINK_LOOP,
+DEFAULT_PROP_HAS_SINK_LOOP, G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
-G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 g_object_class_install_property (gobject_class, PROP_HAS_CHAIN,
 g_param_spec_boolean ("has-chain", "Has Chain",
-"If the element can operate in push mode", DEFAULT_PROP_HAS_CHAIN,
+"If the element can operate in push mode",
-G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+DEFAULT_PROP_HAS_CHAIN, G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
 g_object_class_install_property (gobject_class, PROP_SILENT,
 g_param_spec_boolean ("silent", "Silent",
 "Don't produce last_message events", DEFAULT_PROP_SILENT,
-G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
 g_object_class_install_property (gobject_class, PROP_LAST_MESSAGE,
-g_param_spec_string ("last-message", "Last Message",
+g_param_spec_string ("last_message", "Last Message",
 "The message describing current status", DEFAULT_PROP_LAST_MESSAGE,
-G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+G_PARAM_READABLE));
 g_object_class_install_property (gobject_class, PROP_PULL_MODE,
 g_param_spec_enum ("pull-mode", "Pull mode",
 "Behavior of tee in pull mode", GST_TYPE_TEE_PULL_MODE,
-DEFAULT_PULL_MODE,
+DEFAULT_PULL_MODE, G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
-G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-g_object_class_install_property (gobject_class, PROP_ALLOC_PAD,
-g_param_spec_object ("alloc-pad", "Allocation Src Pad",
-"The pad used for gst_pad_alloc_buffer", GST_TYPE_PAD,
-G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 gstelement_class->request_new_pad =
 GST_DEBUG_FUNCPTR (gst_tee_request_new_pad);
 gstelement_class->release_pad = GST_DEBUG_FUNCPTR (gst_tee_release_pad);
 }
 static void
 gst_tee_init (GstTee * tee, GstTeeClass * g_class)
 {
-tee->dyn_lock = g_mutex_new ();
 tee->sinkpad = gst_pad_new_from_static_template (&sinktemplate, "sink");
 tee->sink_mode = GST_ACTIVATE_NONE;
 gst_pad_set_setcaps_function (tee->sinkpad,
 GST_DEBUG_FUNCPTR (gst_pad_proxy_setcaps));
 gst_pad_set_bufferalloc_function (tee->sinkpad,
 GST_DEBUG_FUNCPTR (gst_tee_buffer_alloc));
 gst_pad_set_activatepush_function (tee->sinkpad,
 GST_DEBUG_FUNCPTR (gst_tee_sink_activate_push));
 gst_pad_set_chain_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_chain));
-gst_pad_set_chain_list_function (tee->sinkpad,
-GST_DEBUG_FUNCPTR (gst_tee_chain_list));
 gst_element_add_pad (GST_ELEMENT (tee), tee->sinkpad);
 tee->last_message = NULL;
 }
 /* install the data, we automatically free it when the pad is disposed because
 * of _release_pad or when the element goes away. */
 data = g_new0 (PushData, 1);
 data->pushed = FALSE;
 data->result = GST_FLOW_NOT_LINKED;
-data->removed = FALSE;
 g_object_set_qdata_full (G_OBJECT (srcpad), push_data, data, g_free);
 GST_OBJECT_UNLOCK (tee);
 switch (mode) {
 GST_OBJECT_LOCK (tee);
 GST_DEBUG_OBJECT (tee, "warning failed to activate request pad");
 if (tee->allocpad == srcpad)
 tee->allocpad = NULL;
 gst_object_unref (srcpad);
-GST_OBJECT_UNLOCK (tee);
+GST_OBJECT_LOCK (tee);
-g_object_notify (G_OBJECT (tee), "alloc-pad");
 return NULL;
 }
 }
 static void
 gst_tee_release_pad (GstElement * element, GstPad * pad)
 {
 GstTee *tee;
-PushData *data;
 tee = GST_TEE (element);
 GST_DEBUG_OBJECT (tee, "releasing pad");
 GST_OBJECT_LOCK (tee);
 if (tee->allocpad == pad)
 tee->allocpad = NULL;
 GST_OBJECT_UNLOCK (tee);
-g_object_notify (G_OBJECT (tee), "alloc-pad");
-/* wait for pending pad_alloc to finish */
-GST_TEE_DYN_LOCK (tee);
-/* mark the pad as removed so that future pad_alloc fails with NOT_LINKED. */
-data = g_object_get_qdata (G_OBJECT (pad), push_data);
-data->removed = TRUE;
 gst_pad_set_active (pad, FALSE);
 gst_element_remove_pad (GST_ELEMENT_CAST (tee), pad);
-GST_TEE_DYN_UNLOCK (tee);
 }
 static void
 gst_tee_set_property (GObject * object, guint prop_id, const GValue * value,
 GParamSpec * pspec)
 tee->silent = g_value_get_boolean (value);
 break;
 case PROP_PULL_MODE:
 tee->pull_mode = g_value_get_enum (value);
 break;
-case PROP_ALLOC_PAD:
-{
-GstPad *pad = g_value_get_object (value);
-GST_OBJECT_LOCK (pad);
-if (GST_OBJECT_PARENT (pad) == GST_OBJECT_CAST (object))
-tee->allocpad = pad;
-else
-GST_WARNING_OBJECT (object, "Tried to set alloc pad %s which"
-" is not my pad", GST_OBJECT_NAME (pad));
-GST_OBJECT_UNLOCK (pad);
-break;
-}
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 break;
 }
 GST_OBJECT_UNLOCK (tee);
 g_value_set_string (value, tee->last_message);
 break;
 case PROP_PULL_MODE:
 g_value_set_enum (value, tee->pull_mode);
 break;
-case PROP_ALLOC_PAD:
-g_value_set_object (value, tee->allocpad);
-break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 break;
 }
 GST_OBJECT_UNLOCK (tee);
 }
 /* we have no previous source pad we can use to proxy the pad alloc. Loop over
 * the source pads, try to alloc a buffer on each one of them. Keep a reference
 * to the first pad that succeeds, we will be using it to alloc more buffers
-* later.  must be called with the OBJECT_LOCK on tee. */
+* later. */
 static GstFlowReturn
 gst_tee_find_buffer_alloc (GstTee * tee, guint64 offset, guint size,
 GstCaps * caps, GstBuffer ** buf)
 {
 GstFlowReturn res;
 pads = GST_ELEMENT_CAST (tee)->srcpads;
 cookie = GST_ELEMENT_CAST (tee)->pads_cookie;
 while (pads) {
 GstPad *pad;
-PushData *data;
 pad = GST_PAD_CAST (pads->data);
 gst_object_ref (pad);
 GST_DEBUG_OBJECT (tee, "try alloc on pad %s:%s", GST_DEBUG_PAD_NAME (pad));
 GST_OBJECT_UNLOCK (tee);
-GST_TEE_DYN_LOCK (tee);
+res = gst_pad_alloc_buffer (pad, offset, size, caps, buf);
-data = g_object_get_qdata (G_OBJECT (pad), push_data);
-if (!data->removed)
-res = gst_pad_alloc_buffer (pad, offset, size, caps, buf);
-else
-res = GST_FLOW_NOT_LINKED;
-GST_TEE_DYN_UNLOCK (tee);
 GST_DEBUG_OBJECT (tee, "got return value %d", res);
 gst_object_unref (pad);
 GST_DEBUG_OBJECT (tee, "pad list changed, restart");
 /* pad list changed, restart. If the pad alloc function returned OK we
 * need to unref the buffer */
 if (res == GST_FLOW_OK)
 gst_buffer_unref (*buf);
-*buf = NULL;
 goto retry;
 }
 if (res == GST_FLOW_OK) {
 GST_DEBUG_OBJECT (tee, "we have a buffer on pad %s:%s",
 GST_DEBUG_PAD_NAME (pad));
 /* we have a buffer, keep the pad for later and exit the loop. */
 tee->allocpad = pad;
-GST_OBJECT_UNLOCK (tee);
-g_object_notify (G_OBJECT (tee), "alloc-pad");
-GST_OBJECT_LOCK (tee);
 break;
 }
 /* no valid buffer, try another pad */
 pads = g_list_next (pads);
 }
 res = GST_FLOW_NOT_LINKED;
 GST_OBJECT_LOCK (tee);
 if ((allocpad = tee->allocpad)) {
-PushData *data;
 /* if we had a previous pad we used for allocating a buffer, continue using
 * it. */
 GST_DEBUG_OBJECT (tee, "using pad %s:%s for alloc",
 GST_DEBUG_PAD_NAME (allocpad));
 gst_object_ref (allocpad);
 GST_OBJECT_UNLOCK (tee);
-GST_TEE_DYN_LOCK (tee);
+res = gst_pad_alloc_buffer (allocpad, offset, size, caps, buf);
-data = g_object_get_qdata (G_OBJECT (allocpad), push_data);
-if (!data->removed)
-res = gst_pad_alloc_buffer (allocpad, offset, size, caps, buf);
-else
-res = GST_FLOW_NOT_LINKED;
-GST_TEE_DYN_UNLOCK (tee);
 gst_object_unref (allocpad);
 GST_OBJECT_LOCK (tee);
 }
 /* either we failed to alloc on the the previous pad or we did not have a
 return res;
 }
 static GstFlowReturn
-gst_tee_do_push (GstTee * tee, GstPad * pad, gpointer data, gboolean is_list)
+gst_tee_do_push (GstTee * tee, GstPad * pad, GstBuffer * buffer)
 {
 GstFlowReturn res;
 if (G_UNLIKELY (!tee->silent)) {
 GST_OBJECT_LOCK (tee);
 g_free (tee->last_message);
-if (is_list) {
+tee->last_message =
-tee->last_message =
+g_strdup_printf ("chain        ******* (%s:%s)t (%d bytes, %"
-g_strdup_printf ("chain-list   ******* (%s:%s)t %p",
+G_GUINT64_FORMAT ") %p", GST_DEBUG_PAD_NAME (pad),
-GST_DEBUG_PAD_NAME (pad), data);
+GST_BUFFER_SIZE (buffer), GST_BUFFER_TIMESTAMP (buffer), buffer);
-} else {
-tee->last_message =
-g_strdup_printf ("chain        ******* (%s:%s)t (%d bytes, %"
-G_GUINT64_FORMAT ") %p", GST_DEBUG_PAD_NAME (pad),
-GST_BUFFER_SIZE (data), GST_BUFFER_TIMESTAMP (data), data);
-}
 GST_OBJECT_UNLOCK (tee);
 g_object_notify (G_OBJECT (tee), "last_message");
 }
 /* Push */
 if (pad == tee->pull_pad) {
 /* don't push on the pad we're pulling from */
 res = GST_FLOW_OK;
-} else if (is_list) {
-res =
-gst_pad_push_list (pad,
-gst_buffer_list_ref (GST_BUFFER_LIST_CAST (data)));
 } else {
-res = gst_pad_push (pad, gst_buffer_ref (GST_BUFFER_CAST (data)));
+res = gst_pad_push (pad, gst_buffer_ref (buffer));
 }
 return res;
 }
 static void
 data->pushed = FALSE;
 data->result = GST_FLOW_NOT_LINKED;
 }
 static GstFlowReturn
-gst_tee_handle_data (GstTee * tee, gpointer data, gboolean is_list)
+gst_tee_handle_buffer (GstTee * tee, GstBuffer * buffer)
 {
 GList *pads;
 guint32 cookie;
 GstFlowReturn ret, cret;
-if (!is_list) {
+tee->offset += GST_BUFFER_SIZE (buffer);
-tee->offset += GST_BUFFER_SIZE (data);
-}
 GST_OBJECT_LOCK (tee);
 /* mark all pads as 'not pushed on yet' */
 g_list_foreach (GST_ELEMENT_CAST (tee)->srcpads, (GFunc) clear_pads, tee);
 pads = GST_ELEMENT_CAST (tee)->srcpads;
 cookie = GST_ELEMENT_CAST (tee)->pads_cookie;
 while (pads) {
 GstPad *pad;
-PushData *pdata;
+PushData *data;
 pad = GST_PAD_CAST (pads->data);
 /* get the private data, something is really wrong with the internal state
 * when it is not there */
-pdata = g_object_get_qdata (G_OBJECT (pad), push_data);
+data = g_object_get_qdata (G_OBJECT (pad), push_data);
-g_assert (pdata != NULL);
+g_assert (data != NULL);
-if (!pdata->pushed) {
+if (!data->pushed) {
 /* not yet pushed, release lock and start pushing */
 gst_object_ref (pad);
 GST_OBJECT_UNLOCK (tee);
-GST_LOG_OBJECT (tee, "Starting to push %s %p",
+GST_LOG_OBJECT (tee, "Starting to push buffer %p", buffer);
-is_list ? "list" : "buffer", data);
+ret = gst_tee_do_push (tee, pad, buffer);
-ret = gst_tee_do_push (tee, pad, data, is_list);
+GST_LOG_OBJECT (tee, "Pushing buffer %p yielded result %s", buffer,
-GST_LOG_OBJECT (tee, "Pushing item %p yielded result %s", data,
 gst_flow_get_name (ret));
 GST_OBJECT_LOCK (tee);
 /* keep track of which pad we pushed and the result value. We need to do
 * this before we release the refcount on the pad, the PushData is
 * destroyed when the last ref of the pad goes away. */
-pdata->pushed = TRUE;
+data->pushed = TRUE;
-pdata->result = ret;
+data->result = ret;
 gst_object_unref (pad);
 } else {
 /* already pushed, use previous return value */
-ret = pdata->result;
+ret = data->result;
 GST_LOG_OBJECT (tee, "pad already pushed with %s",
 gst_flow_get_name (ret));
 }
+/* stop pushing more buffers when we have a fatal error */
-/* before we go combining the return value, check if the pad list is still
+if (GST_FLOW_IS_FATAL (ret))
-* the same. It could be possible that the pad we just pushed was removed
+goto error;
-* and the return value it not valid anymore */
+/* keep all other return values, overwriting the previous one */
+GST_LOG_OBJECT (tee, "Replacing ret val %d with %d", cret, ret);
+if (cret == GST_FLOW_NOT_LINKED)
+cret = ret;
 if (GST_ELEMENT_CAST (tee)->pads_cookie != cookie) {
 GST_LOG_OBJECT (tee, "pad list changed");
 /* the list of pads changed, restart iteration. Pads that we already
 * pushed on and are still in the new list, will not be pushed on
 * again. */
 goto restart;
 }
-/* stop pushing more buffers when we have a fatal error */
-if (ret != GST_FLOW_OK && ret != GST_FLOW_NOT_LINKED)
-goto error;
-/* keep all other return values, overwriting the previous one. */
-if (ret != GST_FLOW_NOT_LINKED) {
-GST_LOG_OBJECT (tee, "Replacing ret val %d with %d", cret, ret);
-cret = ret;
-}
 pads = g_list_next (pads);
 }
 GST_OBJECT_UNLOCK (tee);
-gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
+gst_buffer_unref (buffer);
 /* no need to unset gvalue */
 return cret;
 /* ERRORS */
 error:
 {
 GST_DEBUG_OBJECT (tee, "received error %s", gst_flow_get_name (ret));
-gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
+gst_buffer_unref (buffer);
 GST_OBJECT_UNLOCK (tee);
 return ret;
 }
 }
 tee = GST_TEE (gst_pad_get_parent (pad));
 GST_DEBUG_OBJECT (tee, "received buffer %p", buffer);
-res = gst_tee_handle_data (tee, buffer, FALSE);
+res = gst_tee_handle_buffer (tee, buffer);
 GST_DEBUG_OBJECT (tee, "handled buffer %s", gst_flow_get_name (res));
-gst_object_unref (tee);
-return res;
-}
-static GstFlowReturn
-gst_tee_chain_list (GstPad * pad, GstBufferList * list)
-{
-GstFlowReturn res;
-GstTee *tee;
-tee = GST_TEE (gst_pad_get_parent (pad));
-GST_DEBUG_OBJECT (tee, "received list %p", list);
-res = gst_tee_handle_data (tee, list, TRUE);
-GST_DEBUG_OBJECT (tee, "handled list %s", gst_flow_get_name (res));
 gst_object_unref (tee);
 return res;
 }
 tee = GST_TEE (gst_pad_get_parent (pad));
 ret = gst_pad_pull_range (tee->sinkpad, offset, length, buf);
 if (ret == GST_FLOW_OK)
-ret = gst_tee_handle_data (tee, gst_buffer_ref (*buf), FALSE);
+ret = gst_tee_handle_buffer (tee, gst_buffer_ref (*buf));
 else if (ret == GST_FLOW_UNEXPECTED)
 gst_tee_pull_eos (tee);
 gst_object_unref (tee);

branch	RCL_3
changeset 30	7e817e7e631c
parent 29	567bb019e3e3