FCL/sf/mw/gstreamer: comparison gstreamer

equal deleted inserted replaced

-:567bb019e3e3
+:7e817e7e631c
 * A pointer to any data allocated for this buffer using g_malloc(). If this is
 * non-NULL, this memory will be freed at the end of the buffer's lifecycle
 * (i.e. when its refcount becomes zero).
 */
 #define GST_BUFFER_MALLOCDATA(buf)		(GST_BUFFER_CAST(buf)->malloc_data)
-/**
-* GST_BUFFER_FREE_FUNC:
-* @buf: a #GstBuffer.
-*
-* A pointer to a function that will be called on the buffer's malloc_data when
-* this buffer is finalized. Defaults to g_free().
-*
-* Note that the free function only affects the buffer's malloc_data; if the
-* buffer's malloc_data is %NULL, the function will not be called.
-*
-* Since: 0.10.22
-*/
-#define GST_BUFFER_FREE_FUNC(buf)		(GST_BUFFER_CAST(buf)->free_func)
 /**
 * GST_BUFFER_OFFSET_NONE:
 *
 * Constant for no-offset return results.
 * @GST_BUFFER_FLAG_IN_CAPS: the buffer has been added as a field in a #GstCaps.
 * @GST_BUFFER_FLAG_GAP: the buffer has been created to fill a gap in the
 * stream and contains media neutral data (elements can switch to optimized code
 * path that ignores the buffer content).
 * @GST_BUFFER_FLAG_DELTA_UNIT: this unit cannot be decoded independently.
-* @GST_BUFFER_FLAG_MEDIA1: a flag whose use is specific to the caps of the buffer.
-* Since: 0.10.23
-* @GST_BUFFER_FLAG_MEDIA2: a flag whose use is specific to the caps of the buffer.
-* Since: 0.10.23
-* @GST_BUFFER_FLAG_MEDIA3: a flag whose use is specific to the caps of the buffer.
-* Since: 0.10.23
 * @GST_BUFFER_FLAG_LAST: additional flags can be added starting from this flag.
 *
 * A set of buffer flags used to describe properties of a #GstBuffer.
 */
 typedef enum {
 GST_BUFFER_FLAG_PREROLL    = (GST_MINI_OBJECT_FLAG_LAST << 0),
 GST_BUFFER_FLAG_DISCONT    = (GST_MINI_OBJECT_FLAG_LAST << 1),
 GST_BUFFER_FLAG_IN_CAPS    = (GST_MINI_OBJECT_FLAG_LAST << 2),
 GST_BUFFER_FLAG_GAP        = (GST_MINI_OBJECT_FLAG_LAST << 3),
 GST_BUFFER_FLAG_DELTA_UNIT = (GST_MINI_OBJECT_FLAG_LAST << 4),
-GST_BUFFER_FLAG_MEDIA1     = (GST_MINI_OBJECT_FLAG_LAST << 5),
+/* padding */
-GST_BUFFER_FLAG_MEDIA2     = (GST_MINI_OBJECT_FLAG_LAST << 6),
-GST_BUFFER_FLAG_MEDIA3     = (GST_MINI_OBJECT_FLAG_LAST << 7),
 GST_BUFFER_FLAG_LAST       = (GST_MINI_OBJECT_FLAG_LAST << 8)
 } GstBufferFlag;
 /**
 * GstBuffer:
 *     For file data or compressed data this is the byte offset of the first
 *       byte in this buffer.
 * @offset_end: the last offset contained in this buffer. It has the same
 *     format as @offset.
 * @malloc_data: a pointer to the allocated memory associated with this buffer.
-*     When the buffer is freed, this data will freed with @free_func.
+*     When the buffer is freed, this data will freed with g_free().
-* @free_func: a custom function that will be called with @malloc_data, defaults
-*     to g_free(). Since 0.10.22.
 *
 * The structure of a #GstBuffer. Use the associated macros to access the public
 * variables.
 */
 struct _GstBuffer {
 guint64		 offset;
 guint64		 offset_end;
 guint8                *malloc_data;
-GFreeFunc              free_func;
 /*< private >*/
-gpointer _gst_reserved[GST_PADDING - 1];
+gpointer _gst_reserved[GST_PADDING];
 };
 struct _GstBufferClass {
 GstMiniObjectClass    mini_object_class;
 };
 #endif
 static inline GstBuffer *
 gst_buffer_ref (GstBuffer * buf)
 {
+/* not using a macro here because gcc-4.1 will complain
+* if the return value isn't used (because of the cast) */
 return (GstBuffer *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (buf));
 }
 /**
 * gst_buffer_unref:
 *
 * Decreases the refcount of the buffer. If the refcount reaches 0, the buffer
 * will be freed. If GST_BUFFER_MALLOCDATA() is non-NULL, this pointer will
 * also be freed at this time.
 */
-#ifdef _FOOL_GTK_DOC_
+#define		gst_buffer_unref(buf)		gst_mini_object_unref (GST_MINI_OBJECT_CAST (buf))
-G_INLINE_FUNC void gst_buffer_unref (GstBuffer * buf);
-#endif
-static inline void
-gst_buffer_unref (GstBuffer * buf)
-{
-gst_mini_object_unref (GST_MINI_OBJECT_CAST (buf));
-}
 /* copy buffer */
 /**
 * gst_buffer_copy:
 * @buf: a #GstBuffer.
 *
 * Create a copy of the given buffer. This will also make a newly allocated
 * copy of the data the source buffer contains.
-*
+*/
-* Returns: a new copy of @buf.
+#define		gst_buffer_copy(buf)		GST_BUFFER_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CAST (buf)))
-*/
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBuffer * gst_buffer_copy (const GstBuffer * buf);
-#endif
-static inline GstBuffer *
-gst_buffer_copy (const GstBuffer * buf)
-{
-return GST_BUFFER (gst_mini_object_copy (GST_MINI_OBJECT_CAST (buf)));
-}
 /**
 * GstBufferCopyFlags:
 * @GST_BUFFER_COPY_FLAGS: flag indicating that buffer flags should be copied
 * @GST_BUFFER_COPY_TIMESTAMPS: flag indicating that buffer timestamp, duration,

branch	RCL_3
changeset 30	7e817e7e631c
parent 29	567bb019e3e3