FCL/sf/mw/gstreamer: comparison gstreamer

equal deleted inserted replaced

-:71e347f905f2
+:4a7fac7dd34a
 #include <gst/gstconfig.h>
 #include <gst/gstobject.h>
 #include <gst/gstbuffer.h>
+#include <gst/gstbufferlist.h>
 #include <gst/gstcaps.h>
 #include <gst/gstevent.h>
 #include <gst/gstquery.h>
 #include <gst/gsttask.h>
 #define GST_PAD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PAD, GstPadClass))
 #define GST_PAD_CAST(obj)		((GstPad*)(obj))
 typedef struct _GstPad GstPad;
+typedef struct _GstPadPrivate GstPadPrivate;
 typedef struct _GstPadClass GstPadClass;
 /**
 * GstPadLinkReturn:
 * @GST_PAD_LINK_OK		: link succeeded
 *
 * The implementer of this function receives a refcount to @buffer and should
 * gst_buffer_unref() when the buffer is no longer needed.
 *
 * When a chain function detects an error in the data stream, it must post an
-* error on the buffer and return an appropriate #GstFlowReturn value.
+* error on the bus and return an appropriate #GstFlowReturn value.
 *
 * Returns: #GST_FLOW_OK for success
 */
 typedef GstFlowReturn		(*GstPadChainFunction)		(GstPad *pad, GstBuffer *buffer);
+/**
+* GstPadChainListFunction:
+* @pad: the sink #GstPad that performed the chain.
+* @list: the #GstBufferList that is chained, not %NULL.
+*
+* A function that will be called on sinkpads when chaining buffer lists.
+* The function typically processes the data contained in the buffer list and
+* either consumes the data or passes it on to the internally linked pad(s).
+*
+* The implementer of this function receives a refcount to @list and
+* should gst_buffer_list_unref() when the list is no longer needed.
+*
+* When a chainlist function detects an error in the data stream, it must
+* post an error on the bus and return an appropriate #GstFlowReturn value.
+*
+* Returns: #GST_FLOW_OK for success
+*/
+typedef GstFlowReturn		(*GstPadChainListFunction)	(GstPad *pad, GstBufferList *list);
 /**
 * GstPadGetRangeFunction:
 * @pad: the src #GstPad to perform the getrange on.
 * @offset: the offset of the range
 * @length: the length of the range
 * @pad: The #GstPad to query.
 *
 * The signature of the internal pad link function.
 *
 * Returns: a newly allocated #GList of pads that are linked to the given pad on
-*  the inside of the parent element.
+* the inside of the parent element.
-*  The caller must call g_list_free() on it after use.
+*
+* The caller must call g_list_free() on it after use.
+*
+* Deprecated: use the threadsafe #GstPadIterIntLinkFunction instead.
 */
 typedef GList*			(*GstPadIntLinkFunction)	(GstPad *pad);
+/**
+* GstPadIterIntLinkFunction:
+* @pad: The #GstPad to query.
+*
+* The signature of the internal pad link iterator function.
+*
+* Returns: a new #GstIterator that will iterate over all pads that are
+* linked to the given pad on the inside of the parent element.
+*
+* the caller must call gst_iterator_free() after usage.
+*
+* Since 0.10.21
+*/
+typedef GstIterator*           (*GstPadIterIntLinkFunction)    (GstPad *pad);
 /* generic query function */
 /**
 * GstPadQueryTypeFunction:
 * @pad: a #GstPad to query
 *
 * The purpose of this function is to allocate a buffer that is optimal to
 * be processed by @pad. The function is mostly overridden by elements that can
 * provide a hardware buffer in order to avoid additional memcpy operations.
 *
-* The function can return a buffer that does not have @caps, in which case the
+* The function can return a buffer that has caps different from the requested
-* upstream element requests a format change. If a format change was requested,
+* @caps, in which case the upstream element requests a format change to this
-* the returned buffer will be one to hold the data of said new caps, so its
+* new caps.
-* size might be different from @size.
+* If a format change was requested, the returned buffer will be one to hold
+* the data of said new caps, so its size might be different from the requested
+* @size.
 *
 * When this function returns anything else than #GST_FLOW_OK, the buffer allocation
-* failed and @buf does not contain valid data.
+* failed and @buf does not contain valid data. If the function returns #GST_FLOW_OK and
+* the @buf is NULL, a #GstBuffer will be created with @caps, @offset and @size.
 *
 * By default this function returns a new buffer of @size and with @caps containing
 * purely malloced data. The buffer should be freed with gst_buffer_unref()
 * after usage.
 *
 * @activatepullfunc: function to activate/deactivate pad in pull mode
 * @linkfunc: function called when pad is linked
 * @unlinkfunc: function called when pad is unlinked
 * @peer: the pad this pad is linked to
 * @sched_private: private storage for the scheduler
-* @chainfunc: function to chain data to pad
+* @chainfunc: function to chain buffer to pad
 * @checkgetrangefunc: function to check if pad can operate in pull mode
 * @getrangefunc: function to get a range of data from a pad
 * @eventfunc: function to send an event to a pad
 * @mode: current activation mode of the pad
 * @querytypefunc: get list of supported queries
 * @queryfunc: perform a query on the pad
 * @intlinkfunc: get the internal links of this pad
 * @bufferallocfunc: function to allocate a buffer for this pad
 * @do_buffer_signals: counter counting installed buffer signals
 * @do_event_signals: counter counting installed event signals
+* @iterintlinkfunc: get the internal links iterator of this pad
+* @block_destroy_data: notify function for gst_pad_set_blocked_async_full()
 *
 * The #GstPad structure. Use the functions to update the variables.
 */
 struct _GstPad {
 GstObject			object;
 /* whether to emit signals for have-data. counts number
 * of handlers attached. */
 gint				 do_buffer_signals;
 gint				 do_event_signals;
+/* ABI added */
+/* iterate internal links */
+GstPadIterIntLinkFunction     iterintlinkfunc;
+/* free block_data */
+GDestroyNotify block_destroy_data;
 /*< private >*/
-gpointer _gst_reserved[GST_PADDING];
+union {
+struct {
+gboolean                      block_callback_called;
+GstPadPrivate                *priv;
+} ABI;
+gpointer _gst_reserved[GST_PADDING - 2];
+} abidata;
 };
 struct _GstPadClass {
 GstObjectClass	parent_class;
 #define GST_PAD_GETRANGEFUNC(pad)	(GST_PAD_CAST(pad)->getrangefunc)
 #define GST_PAD_EVENTFUNC(pad)		(GST_PAD_CAST(pad)->eventfunc)
 #define GST_PAD_QUERYTYPEFUNC(pad)	(GST_PAD_CAST(pad)->querytypefunc)
 #define GST_PAD_QUERYFUNC(pad)		(GST_PAD_CAST(pad)->queryfunc)
 #define GST_PAD_INTLINKFUNC(pad)	(GST_PAD_CAST(pad)->intlinkfunc)
+#define GST_PAD_ITERINTLINKFUNC(pad)    (GST_PAD_CAST(pad)->iterintlinkfunc)
 #define GST_PAD_PEER(pad)		(GST_PAD_CAST(pad)->peer)
 #define GST_PAD_LINKFUNC(pad)		(GST_PAD_CAST(pad)->linkfunc)
 #define GST_PAD_UNLINKFUNC(pad)		(GST_PAD_CAST(pad)->unlinkfunc)
+/**
+* GST_PAD_CAPS:
+* @pad: a #GstPad.
+*
+* The caps for this pad.
+*/
 #define GST_PAD_CAPS(pad)		(GST_PAD_CAST(pad)->caps)
 #define GST_PAD_GETCAPSFUNC(pad)	(GST_PAD_CAST(pad)->getcapsfunc)
 #define GST_PAD_SETCAPSFUNC(pad)	(GST_PAD_CAST(pad)->setcapsfunc)
 #define GST_PAD_ACCEPTCAPSFUNC(pad)	(GST_PAD_CAST(pad)->acceptcapsfunc)
 #define GST_PAD_FIXATECAPSFUNC(pad)	(GST_PAD_CAST(pad)->fixatecapsfunc)
 								 GstPadBlockCallback callback, gpointer user_data);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
+gboolean		gst_pad_set_blocked_async_full		(GstPad *pad, gboolean blocked,
+								 GstPadBlockCallback callback, gpointer user_data,
+GDestroyNotify destroy_data);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
 gboolean		gst_pad_is_blocked			(GstPad *pad);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 void			gst_pad_set_chain_function		(GstPad *pad, GstPadChainFunction chain);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
+void			gst_pad_set_chain_list_function	(GstPad *pad, GstPadChainListFunction chainlist);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
 void			gst_pad_set_getrange_function		(GstPad *pad, GstPadGetRangeFunction get);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
+gboolean                gst_pad_can_link                        (GstPad *srcpad, GstPad *sinkpad);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
 GstPadLinkReturn        gst_pad_link				(GstPad *srcpad, GstPad *sinkpad);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 #endif
 G_CONST_RETURN GstCaps*	gst_pad_get_pad_template_caps		(GstPad *pad);
-/* capsnego function for connected/unconnected pads */
+/* capsnego function for linked/unlinked pads */
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 GstCaps *		gst_pad_get_caps			(GstPad * pad);
 IMPORT_C
 #endif
 gboolean		gst_pad_peer_accept_caps		(GstPad * pad, GstCaps *caps);
-/* capsnego for connected pads */
+/* capsnego for linked pads */
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 GstCaps *		gst_pad_get_allowed_caps		(GstPad * pad);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 GstFlowReturn		gst_pad_push				(GstPad *pad, GstBuffer *buffer);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
+GstFlowReturn		gst_pad_push_list			(GstPad *pad, GstBufferList *list);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 gboolean		gst_pad_check_pull_range		(GstPad *pad);
 GstFlowReturn		gst_pad_chain				(GstPad *pad, GstBuffer *buffer);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
+GstFlowReturn		gst_pad_chain_list                      (GstPad *pad, GstBufferList *list);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
 GstFlowReturn		gst_pad_get_range			(GstPad *pad, guint64 offset, guint size,
 								 GstBuffer **buffer);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 GList*			gst_pad_get_internal_links_default	(GstPad *pad);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
+void                    gst_pad_set_iterate_internal_links_function (GstPad * pad,
+GstPadIterIntLinkFunction iterintlink);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
+GstIterator *           gst_pad_iterate_internal_links          (GstPad * pad);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
+GstIterator *           gst_pad_iterate_internal_links_default  (GstPad * pad);
 /* generic query function */
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif

changeset 8	4a7fac7dd34a
parent 0	0e761a78d257
child 10	6f340f756486