FCL/sf/mw/gstreamer: comparison gst_plugins_base/gst-libs/gst/app/gstappsink.c

equal deleted inserted replaced

-:567bb019e3e3
+:7e817e7e631c
 #endif
 #include <gst/gst.h>
 #include <gst/base/gstbasesink.h>
 #include <gst/gstbuffer.h>
-#include <gst/gstbufferlist.h>
 #include <string.h>
 #include "gstappsink.h"
+#ifdef __SYMBIAN32__
+#include <glib_global.h>
+#endif
 struct _GstAppSinkPrivate
 {
 GstCaps *caps;
 gboolean emit_signals;
 guint max_buffers;
 {
 /* signals */
 SIGNAL_EOS,
 SIGNAL_NEW_PREROLL,
 SIGNAL_NEW_BUFFER,
-SIGNAL_NEW_BUFFER_LIST,
 /* actions */
 SIGNAL_PULL_PREROLL,
 SIGNAL_PULL_BUFFER,
-SIGNAL_PULL_BUFFER_LIST,
 LAST_SIGNAL
 };
 #define DEFAULT_PROP_EOS		TRUE
 #ifdef __SYMBIAN32__
 static void gst_app_sink_class_init (GstAppSinkClass * klass);
 static void gst_app_sink_init (GstAppSink * appsink, GstAppSinkClass * klass);
 static void gst_app_sink_base_init (gpointer g_class);
 #endif
 static void gst_app_sink_set_property (GObject * object, guint prop_id,
 const GValue * value, GParamSpec * pspec);
 static void gst_app_sink_get_property (GObject * object, guint prop_id,
 GValue * value, GParamSpec * pspec);
 static gboolean gst_app_sink_start (GstBaseSink * psink);
 static gboolean gst_app_sink_stop (GstBaseSink * psink);
 static gboolean gst_app_sink_event (GstBaseSink * sink, GstEvent * event);
 static GstFlowReturn gst_app_sink_preroll (GstBaseSink * psink,
 GstBuffer * buffer);
-static GstFlowReturn gst_app_sink_render_common (GstBaseSink * psink,
-GstMiniObject * data, gboolean is_list);
 static GstFlowReturn gst_app_sink_render (GstBaseSink * psink,
 GstBuffer * buffer);
-static GstFlowReturn gst_app_sink_render_list (GstBaseSink * psink,
-GstBufferList * list);
 static GstCaps *gst_app_sink_getcaps (GstBaseSink * psink);
-static GstMiniObject *gst_app_sink_pull_object (GstAppSink * appsink);
 static guint gst_app_sink_signals[LAST_SIGNAL] = { 0 };
 static void
 _do_init (GType filesrc_type)
 {
 parent_class = (GstBaseSinkClass *)
 g_type_class_peek_parent (g_class);
 gst_app_sink_class_init ((GstAppSinkClass *)g_class);
 }
 EXPORT_C GType
 gst_app_sink_get_type (void)
 {
 static GType object_type = 0;
 if (G_UNLIKELY (object_type == 0)) {
 gobject_class->get_property = gst_app_sink_get_property;
 g_object_class_install_property (gobject_class, PROP_CAPS,
 g_param_spec_boxed ("caps", "Caps",
 "The allowed caps for the sink pad", GST_TYPE_CAPS,
-G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+G_PARAM_READWRITE));
 g_object_class_install_property (gobject_class, PROP_EOS,
 g_param_spec_boolean ("eos", "EOS",
 "Check if the sink is EOS or not started", DEFAULT_PROP_EOS,
-G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+G_PARAM_READABLE));
 g_object_class_install_property (gobject_class, PROP_EMIT_SIGNALS,
 g_param_spec_boolean ("emit-signals", "Emit signals",
 "Emit new-preroll and new-buffer signals", DEFAULT_PROP_EMIT_SIGNALS,
-G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+G_PARAM_READWRITE));
 g_object_class_install_property (gobject_class, PROP_MAX_BUFFERS,
 g_param_spec_uint ("max-buffers", "Max Buffers",
 "The maximum number of buffers to queue internally (0 = unlimited)",
 0, G_MAXUINT, DEFAULT_PROP_MAX_BUFFERS,
-G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+G_PARAM_READWRITE));
 g_object_class_install_property (gobject_class, PROP_DROP,
 g_param_spec_boolean ("drop", "Drop",
 "Drop old buffers when the buffer queue is filled", DEFAULT_PROP_DROP,
-G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+G_PARAM_READWRITE));
 /**
 * GstAppSink::eos:
 * @appsink: the appsink element that emited the signal
 *
 */
 gst_app_sink_signals[SIGNAL_NEW_BUFFER] =
 g_signal_new ("new-buffer", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
 G_STRUCT_OFFSET (GstAppSinkClass, new_buffer),
 NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE);
-/**
-* GstAppSink::new-buffer-list:
-* @appsink: the appsink element that emited the signal
-*
-* Signal that a new bufferlist is available.
-*
-* This signal is emited from the steaming thread and only when the
-* "emit-signals" property is %TRUE.
-*
-* The new buffer can be retrieved with the "pull-buffer-list" action
-* signal or gst_app_sink_pull_buffe_listr() either from this signal callback
-* or from any other thread.
-*
-* Note that this signal is only emited when the "emit-signals" property is
-* set to %TRUE, which it is not by default for performance reasons.
-*/
-gst_app_sink_signals[SIGNAL_NEW_BUFFER_LIST] =
-g_signal_new ("new-buffer-list", G_TYPE_FROM_CLASS (klass),
-G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAppSinkClass, new_buffer_list),
-NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE);
 /**
 * GstAppSink::pull-preroll:
 * @appsink: the appsink element to emit this signal on
 *
 gst_app_sink_signals[SIGNAL_PULL_BUFFER] =
 g_signal_new ("pull-buffer", G_TYPE_FROM_CLASS (klass),
 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass,
 pull_buffer), NULL, NULL, gst_app_marshal_BUFFER__VOID,
 GST_TYPE_BUFFER, 0, G_TYPE_NONE);
-/**
-* GstAppSink::pull-buffer-list:
-* @appsink: the appsink element to emit this signal on
-*
-* This function blocks until a buffer list or EOS becomes available or the appsink
-* element is set to the READY/NULL state.
-*
-* This function will only return bufferlists when the appsink is in the PLAYING
-* state. All rendered bufferlists will be put in a queue so that the application
-* can pull bufferlists at its own rate.
-*
-* Note that when the application does not pull bufferlists fast enough, the
-* queued bufferlists could consume a lot of memory, especially when dealing with
-* raw video frames. It's possible to control the behaviour of the queue with
-* the "drop" and "max-buffers" properties.
-*
-* If an EOS event was received before any buffers, this function returns
-* %NULL. Use gst_app_sink_is_eos () to check for the EOS condition.
-*
-* Returns: a #GstBufferList or NULL when the appsink is stopped or EOS.
-*/
-gst_app_sink_signals[SIGNAL_PULL_BUFFER_LIST] =
-g_signal_new ("pull-buffer-list", G_TYPE_FROM_CLASS (klass),
-G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass,
-pull_buffer_list), NULL, NULL, gst_app_marshal_BUFFER__VOID,
-GST_TYPE_BUFFER_LIST, 0, G_TYPE_NONE);
 basesink_class->unlock = gst_app_sink_unlock_start;
 basesink_class->unlock_stop = gst_app_sink_unlock_stop;
 basesink_class->start = gst_app_sink_start;
 basesink_class->stop = gst_app_sink_stop;
 basesink_class->event = gst_app_sink_event;
 basesink_class->preroll = gst_app_sink_preroll;
 basesink_class->render = gst_app_sink_render;
-basesink_class->render_list = gst_app_sink_render_list;
 basesink_class->get_caps = gst_app_sink_getcaps;
 klass->pull_preroll = gst_app_sink_pull_preroll;
 klass->pull_buffer = gst_app_sink_pull_buffer;
-klass->pull_buffer_list = gst_app_sink_pull_buffer_list;
 g_type_class_add_private (klass, sizeof (GstAppSinkPrivate));
 }
 static void
 static void
 gst_app_sink_dispose (GObject * obj)
 {
 GstAppSink *appsink = GST_APP_SINK (obj);
-GstMiniObject *queue_obj;
+GstBuffer *buffer;
 GST_OBJECT_LOCK (appsink);
 if (appsink->priv->caps) {
 gst_caps_unref (appsink->priv->caps);
 appsink->priv->caps = NULL;
 g_mutex_lock (appsink->priv->mutex);
 if (appsink->priv->preroll) {
 gst_buffer_unref (appsink->priv->preroll);
 appsink->priv->preroll = NULL;
 }
-while ((queue_obj = g_queue_pop_head (appsink->priv->queue)))
+while ((buffer = g_queue_pop_head (appsink->priv->queue)))
-gst_mini_object_unref (queue_obj);
+gst_buffer_unref (buffer);
 g_mutex_unlock (appsink->priv->mutex);
 G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
 }
 static void
 gst_app_sink_flush_unlocked (GstAppSink * appsink)
 {
-GstMiniObject *obj;
+GstBuffer *buffer;
 GST_DEBUG_OBJECT (appsink, "flush stop appsink");
 appsink->priv->is_eos = FALSE;
 gst_buffer_replace (&appsink->priv->preroll, NULL);
-while ((obj = g_queue_pop_head (appsink->priv->queue)))
+while ((buffer = g_queue_pop_head (appsink->priv->queue)))
-gst_mini_object_unref (obj);
+gst_buffer_unref (buffer);
 g_cond_signal (appsink->priv->cond);
 }
 static gboolean
 gst_app_sink_start (GstBaseSink * psink)
 return GST_FLOW_WRONG_STATE;
 }
 }
 static GstFlowReturn
-gst_app_sink_render_common (GstBaseSink * psink, GstMiniObject * data,
+gst_app_sink_render (GstBaseSink * psink, GstBuffer * buffer)
-gboolean is_list)
+{
-{
+GstFlowReturn res = GST_FLOW_OK;
 GstAppSink *appsink = GST_APP_SINK (psink);
 gboolean emit;
 g_mutex_lock (appsink->priv->mutex);
 if (appsink->priv->flushing)
 goto flushing;
-GST_DEBUG_OBJECT (appsink, "pushing render buffer%s %p on queue (%d)",
+GST_DEBUG_OBJECT (appsink, "pushing render buffer %p on queue (%d)",
-is_list ? " list" : "", data, appsink->priv->queue->length);
+buffer, appsink->priv->queue->length);
 while (appsink->priv->max_buffers > 0 &&
 appsink->priv->queue->length >= appsink->priv->max_buffers) {
 if (appsink->priv->drop) {
-GstMiniObject *obj;
+GstBuffer *buf;
-/* we need to drop the oldest buffer/list and try again */
+/* we need to drop the oldest buffer and try again */
-obj = g_queue_pop_head (appsink->priv->queue);
+buf = g_queue_pop_head (appsink->priv->queue);
-GST_DEBUG_OBJECT (appsink, "dropping old buffer/list %p", obj);
+GST_DEBUG_OBJECT (appsink, "dropping old buffer %p", buf);
-gst_mini_object_unref (obj);
+gst_buffer_unref (buf);
 } else {
 GST_DEBUG_OBJECT (appsink, "waiting for free space, length %d >= %d",
 appsink->priv->queue->length, appsink->priv->max_buffers);
 /* wait for a buffer to be removed or flush */
 g_cond_wait (appsink->priv->cond, appsink->priv->mutex);
 if (appsink->priv->flushing)
 goto flushing;
 }
 }
 /* we need to ref the buffer when pushing it in the queue */
-g_queue_push_tail (appsink->priv->queue, gst_mini_object_ref (data));
+g_queue_push_tail (appsink->priv->queue, gst_buffer_ref (buffer));
 g_cond_signal (appsink->priv->cond);
 emit = appsink->priv->emit_signals;
 g_mutex_unlock (appsink->priv->mutex);
-if (is_list) {
+if (appsink->priv->callbacks.new_buffer)
-if (appsink->priv->callbacks.new_buffer_list)
+res =
-appsink->priv->callbacks.new_buffer_list (appsink,
+appsink->priv->callbacks.new_buffer (appsink, appsink->priv->user_data);
-appsink->priv->user_data);
+else if (emit)
-} else {
+g_signal_emit (appsink, gst_app_sink_signals[SIGNAL_NEW_BUFFER], 0);
-if (appsink->priv->callbacks.new_buffer)
-appsink->priv->callbacks.new_buffer (appsink, appsink->priv->user_data);
+return res;
-else if (emit)
-g_signal_emit (appsink, gst_app_sink_signals[SIGNAL_NEW_BUFFER], 0);
-}
-return GST_FLOW_OK;
 flushing:
 {
 GST_DEBUG_OBJECT (appsink, "we are flushing");
 g_mutex_unlock (appsink->priv->mutex);
 return GST_FLOW_WRONG_STATE;
 }
 }
-static GstFlowReturn
-gst_app_sink_render (GstBaseSink * psink, GstBuffer * buffer)
-{
-return gst_app_sink_render_common (psink, GST_MINI_OBJECT_CAST (buffer),
-FALSE);
-}
-static GstFlowReturn
-gst_app_sink_render_list (GstBaseSink * psink, GstBufferList * list)
-{
-return gst_app_sink_render_common (psink, GST_MINI_OBJECT_CAST (list), TRUE);
-}
 static GstCaps *
 gst_app_sink_getcaps (GstBaseSink * psink)
 {
 GstCaps *caps;
 gst_caps_ref (caps);
 GST_DEBUG_OBJECT (appsink, "got caps %" GST_PTR_FORMAT, caps);
 GST_OBJECT_UNLOCK (appsink);
 return caps;
-}
-static GstMiniObject *
-gst_app_sink_pull_object (GstAppSink * appsink)
-{
-GstMiniObject *obj = NULL;
-g_return_val_if_fail (appsink != NULL, NULL);
-g_return_val_if_fail (GST_IS_APP_SINK (appsink), NULL);
-g_mutex_lock (appsink->priv->mutex);
-while (TRUE) {
-GST_DEBUG_OBJECT (appsink, "trying to grab a buffer/list");
-if (!appsink->priv->started)
-goto not_started;
-if (!g_queue_is_empty (appsink->priv->queue))
-break;
-if (appsink->priv->is_eos)
-goto eos;
-/* nothing to return, wait */
-GST_DEBUG_OBJECT (appsink, "waiting for a buffer/list");
-g_cond_wait (appsink->priv->cond, appsink->priv->mutex);
-}
-obj = g_queue_pop_head (appsink->priv->queue);
-GST_DEBUG_OBJECT (appsink, "we have a buffer/list %p", obj);
-g_cond_signal (appsink->priv->cond);
-g_mutex_unlock (appsink->priv->mutex);
-return obj;
-/* special conditions */
-eos:
-{
-GST_DEBUG_OBJECT (appsink, "we are EOS, return NULL");
-g_mutex_unlock (appsink->priv->mutex);
-return NULL;
-}
-not_started:
-{
-GST_DEBUG_OBJECT (appsink, "we are stopped, return NULL");
-g_mutex_unlock (appsink->priv->mutex);
-return NULL;
-}
 }
 /* external API */
 /**
 *
 * Returns: a #GstBuffer or NULL when the appsink is stopped or EOS.
 *
 * Since: 0.10.22
 */
 EXPORT_C GstBuffer *
 gst_app_sink_pull_buffer (GstAppSink * appsink)
 {
-GST_DEBUG_OBJECT (appsink, "pull a buffer");
+GstBuffer *buf = NULL;
-return GST_BUFFER_CAST (gst_app_sink_pull_object (appsink));
-}
+g_return_val_if_fail (appsink != NULL, NULL);
+g_return_val_if_fail (GST_IS_APP_SINK (appsink), NULL);
-/**
-* gst_app_sink_pull_buffer_list:
+g_mutex_lock (appsink->priv->mutex);
-* @appsink: a #GstAppSink
-*
+while (TRUE) {
-* This function blocks until a buffer list or EOS becomes available or the
+GST_DEBUG_OBJECT (appsink, "trying to grab a buffer");
-* appsink element is set to the READY/NULL state.
+if (!appsink->priv->started)
-*
+goto not_started;
-* This function will only return buffer lists when the appsink is in the
-* PLAYING state. All rendered buffer lists will be put in a queue so that
+if (!g_queue_is_empty (appsink->priv->queue))
-* the application can pull buffer lists at its own rate. Note that when
+break;
-* the application does not pull buffer lists fast enough, the queued buffer
-* lists could consume a lot of memory, especially when dealing with raw
+if (appsink->priv->is_eos)
-* video frames.
+goto eos;
-*
-* If an EOS event was received before any buffer lists, this function returns
+/* nothing to return, wait */
-* %NULL. Use gst_app_sink_is_eos () to check for the EOS condition.
+GST_DEBUG_OBJECT (appsink, "waiting for a buffer");
-*
+g_cond_wait (appsink->priv->cond, appsink->priv->mutex);
-* Returns: a #GstBufferList or NULL when the appsink is stopped or EOS.
+}
-*/
+buf = g_queue_pop_head (appsink->priv->queue);
-EXPORT_C GstBufferList *
+GST_DEBUG_OBJECT (appsink, "we have a buffer %p", buf);
-gst_app_sink_pull_buffer_list (GstAppSink * appsink)
+g_cond_signal (appsink->priv->cond);
-{
+g_mutex_unlock (appsink->priv->mutex);
-GST_DEBUG_OBJECT (appsink, "pull a buffer list");
-return GST_BUFFER_LIST_CAST (gst_app_sink_pull_object (appsink));
+return buf;
+/* special conditions */
+eos:
+{
+GST_DEBUG_OBJECT (appsink, "we are EOS, return NULL");
+g_mutex_unlock (appsink->priv->mutex);
+return NULL;
+}
+not_started:
+{
+GST_DEBUG_OBJECT (appsink, "we are stopped, return NULL");
+g_mutex_unlock (appsink->priv->mutex);
+return NULL;
+}
 }
 /**
 * gst_app_sink_set_callbacks:
 * @appsink: a #GstAppSink
 * If callbacks are installed, no signals will be emited for performance
 * reasons.
 *
 * Since: 0.10.23
 */
-EXPORT_C void
+void
 gst_app_sink_set_callbacks (GstAppSink * appsink,
 GstAppSinkCallbacks * callbacks, gpointer user_data, GDestroyNotify notify)
 {
 GDestroyNotify old_notify;

branch	RCL_3
changeset 30	7e817e7e631c
parent 29	567bb019e3e3