From a86feaf099f260d3f9e604e1298e35f112fcd44e Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 30 May 2005 15:44:50 +0000 Subject: [PATCH] gst/gstbuffer.*: Avoid typechecking in places where not needed. Original commit message from CVS: * gst/gstbuffer.c: (gst_subbuffer_finalize), (gst_buffer_create_sub), (gst_buffer_is_span_fast): * gst/gstbuffer.h: Avoid typechecking in places where not needed. Added accessor for malloc_data. --- ChangeLog | 8 ++++++++ gst/gstbuffer.c | 6 +++--- gst/gstbuffer.h | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5aa5e49..5632a3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2005-05-30 Wim Taymans + * gst/gstbuffer.c: (gst_subbuffer_finalize), + (gst_buffer_create_sub), (gst_buffer_is_span_fast): + * gst/gstbuffer.h: + Avoid typechecking in places where not needed. + Added accessor for malloc_data. + +2005-05-30 Wim Taymans + * gst/gstpad.c: (gst_real_pad_init), (gst_pad_set_active), (gst_pad_link_prepare), (gst_pad_link), (gst_pad_accept_caps), (gst_pad_configure_sink), (gst_pad_configure_src), diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c index b46aea2..4656eb1 100644 --- a/gst/gstbuffer.c +++ b/gst/gstbuffer.c @@ -365,8 +365,8 @@ gst_buffer_create_sub (GstBuffer * buffer, guint offset, guint size) parent); /* set the right values in the child */ - GST_BUFFER_DATA (GST_BUFFER (subbuffer)) = buffer->data + offset; - GST_BUFFER_SIZE (GST_BUFFER (subbuffer)) = size; + GST_BUFFER_DATA (GST_BUFFER_CAST (subbuffer)) = buffer->data + offset; + GST_BUFFER_SIZE (GST_BUFFER_CAST (subbuffer)) = size; /* we can copy the timestamp and offset if the new buffer starts at * offset 0 */ @@ -383,7 +383,7 @@ gst_buffer_create_sub (GstBuffer * buffer, guint offset, guint size) GST_BUFFER_CAPS (subbuffer) = NULL; - return GST_BUFFER (subbuffer); + return GST_BUFFER_CAST (subbuffer); } /** diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index 8e81ba5..49754bb 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -41,6 +41,7 @@ typedef struct _GstBufferClass GstBufferClass; #define GST_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BUFFER, GstBufferClass)) #define GST_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_BUFFER, GstBuffer)) #define GST_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_BUFFER, GstBufferClass)) +#define GST_BUFFER_CAST(obj) ((GstBuffer *)(obj)) #define GST_BUFFER_FLAGS(buf) GST_MINI_OBJECT_FLAGS(buf) #define GST_BUFFER_FLAG_IS_SET(buf,flag) GST_MINI_OBJECT_FLAG_IS_SET (buf, flag) @@ -54,6 +55,7 @@ typedef struct _GstBufferClass GstBufferClass; #define GST_BUFFER_CAPS(buf) (GST_BUFFER(buf)->caps) #define GST_BUFFER_OFFSET(buf) (GST_BUFFER(buf)->offset) #define GST_BUFFER_OFFSET_END(buf) (GST_BUFFER(buf)->offset_end) +#define GST_BUFFER_MALLOCDATA(buf) (GST_BUFFER(buf)->malloc_data) #define GST_BUFFER_OFFSET_NONE ((guint64)-1) #define GST_BUFFER_MAXSIZE_NONE ((guint)0) -- 2.7.4