mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

fixes for gstbuffer, and removed ## from gstcaps.h that was causing all that warning noise

Browse source 
Original commit message from CVS:
fixes for gstbuffer, and removed ## from gstcaps.h that was causing all that warning noise
This commit is contained in:
Erik Walthinsen 2001-04-22 04:38:36 +00:00
parent e5abd7fde7
commit faf4bde938
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstbuffer.c
View file

@ -64,7 +64,6 @@ gst_buffer_new(void)
buffer->refcount = 1; buffer->refcount = 1;
#endif #endif
buffer->flags = 0; buffer->flags = 0;
buffer->type = 0;
buffer->data = NULL; buffer->data = NULL;
buffer->size = 0; buffer->size = 0;
buffer->maxsize = 0; buffer->maxsize = 0;
@ -126,7 +125,6 @@ gst_buffer_create_sub (GstBuffer *parent,
// copy flags and type from parent, for lack of better // copy flags and type from parent, for lack of better
buffer->flags = parent->flags; buffer->flags = parent->flags;
buffer->type = parent->type;
// set the data pointer, size, offset, and maxsize // set the data pointer, size, offset, and maxsize
buffer->data = parent->data + offset; buffer->data = parent->data + offset;
@ -414,7 +412,7 @@ gst_buffer_copy (GstBuffer *buffer)
newbuf = gst_buffer_new(); newbuf = gst_buffer_new();
GST_BUFFER_SIZE(newbuf) = GST_BUFFER_SIZE(buffer); GST_BUFFER_SIZE(newbuf) = GST_BUFFER_SIZE(buffer);
GST_BUFFER_DATA(newbuf) = malloc(GST_BUFFER_SIZE(buffer)); GST_BUFFER_DATA(newbuf) = malloc(GST_BUFFER_SIZE(buffer));
memcpy(GST_BUFFER_DATA(newbuf),GST_BUFFER_DATA(buf),GST_BUFFER_SIZE(buffer)); memcpy(GST_BUFFER_DATA(newbuf),GST_BUFFER_DATA(buffer),GST_BUFFER_SIZE(buffer));
GST_BUFFER_MAXSIZE(newbuf) = GST_BUFFER_MAXSIZE(buffer); GST_BUFFER_MAXSIZE(newbuf) = GST_BUFFER_MAXSIZE(buffer);
GST_BUFFER_OFFSET(newbuf) = GST_BUFFER_OFFSET(buffer); GST_BUFFER_OFFSET(newbuf) = GST_BUFFER_OFFSET(buffer);
GST_BUFFER_TIMESTAMP(newbuf) = GST_BUFFER_TIMESTAMP(buffer); GST_BUFFER_TIMESTAMP(newbuf) = GST_BUFFER_TIMESTAMP(buffer);

5
gst/gstbuffer.h
View file

@ -54,13 +54,14 @@ extern "C" {
G_STMT_START{ (GST_BUFFER_FLAGS(buf) &= ~(1<<(flag))); }G_STMT_END G_STMT_START{ (GST_BUFFER_FLAGS(buf) &= ~(1<<(flag))); }G_STMT_END
#define GST_BUFFER_TYPE(buf) (GST_BUFFER(buf)->type)
#define GST_BUFFER_DATA(buf) (GST_BUFFER(buf)->data) #define GST_BUFFER_DATA(buf) (GST_BUFFER(buf)->data)
#define GST_BUFFER_SIZE(buf) (GST_BUFFER(buf)->size) #define GST_BUFFER_SIZE(buf) (GST_BUFFER(buf)->size)
#define GST_BUFFER_OFFSET(buf) (GST_BUFFER(buf)->offset) #define GST_BUFFER_OFFSET(buf) (GST_BUFFER(buf)->offset)
#define GST_BUFFER_MAXSIZE(buf) (GST_BUFFER(buf)->maxsize) #define GST_BUFFER_MAXSIZE(buf) (GST_BUFFER(buf)->maxsize)
#define GST_BUFFER_TIMESTAMP(buf) (GST_BUFFER(buf)->timestamp) #define GST_BUFFER_TIMESTAMP(buf) (GST_BUFFER(buf)->timestamp)
#define GST_BUFFER_MAXAGE(buf) (GST_BUFFER(buf)->maxage)
#define GST_BUFFER_BUFFERPOOL(buf) (GST_BUFFER(buf)->pool) #define GST_BUFFER_BUFFERPOOL(buf) (GST_BUFFER(buf)->pool)
#define GST_BUFFER_PARENT(buf) (GST_BUFFER(buf)->parent)
#define GST_BUFFER_POOL_PRIVATE(buf) (GST_BUFFER(buf)->pool_private) #define GST_BUFFER_POOL_PRIVATE(buf) (GST_BUFFER(buf)->pool_private)
@ -96,8 +97,6 @@ struct _GstBuffer {
#define GST_BUFFER_REFCOUNT(buf) (GST_BUFFER(buf)->refcount) #define GST_BUFFER_REFCOUNT(buf) (GST_BUFFER(buf)->refcount)
#endif #endif
/* data type of this buffer */
guint16 type;
/* flags */ /* flags */
guint16 flags; guint16 flags;

4
gst/gstcaps.h
View file

@ -61,7 +61,7 @@ gst_caps_new ( \
name, \ name, \
type, \ type, \
gst_props_new ( \ gst_props_new ( \
##a, \ a, \
NULL)) NULL))
#define GST_CAPS_FACTORY(factoryname, a...) \ #define GST_CAPS_FACTORY(factoryname, a...) \
@ -70,7 +70,7 @@ factoryname (void) \
{ \ { \
static GstCaps *caps = NULL; \ static GstCaps *caps = NULL; \
if (!caps) { \ if (!caps) { \
caps = gst_caps_chain (##a, NULL); \ caps = gst_caps_chain (a, NULL); \
} \ } \
return caps; \ return caps; \
} }