mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstbuffer.c: (gst_buffer_join): Add function gst_buffer_join() to eventually deprecate gst_buffer_merge(). (bug...

Browse source 
Original commit message from CVS:
* gst/gstbuffer.c: (gst_buffer_join):  Add function gst_buffer_join()
to eventually deprecate gst_buffer_merge().  (bug: #136408)
* gst/gstbuffer.h:
This commit is contained in:
David Schleef 2004-04-01 00:40:26 +00:00
parent e6a6307944
commit cf56f6b30c
3 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-03-31 David Schleef <ds@schleef.org>
* gst/gstbuffer.c: (gst_buffer_join): Add function gst_buffer_join()
to eventually deprecate gst_buffer_merge(). (bug: #136408)
* gst/gstbuffer.h:
2004-03-31 David Schleef <ds@schleef.org> 2004-03-31 David Schleef <ds@schleef.org>
* gst/gstvalue.c: (gst_value_union_int_int_range), * gst/gstvalue.c: (gst_value_union_int_int_range),

34
gst/gstbuffer.c
View file

@ -318,8 +318,11 @@ gst_buffer_create_sub (GstBuffer * parent, guint offset, guint size)
* buffers. The original source buffers will not be modified or * buffers. The original source buffers will not be modified or
* unref'd. * unref'd.
* *
* Internally is nothing more than a specialized gst_buffer_span(), * WARNING: Incorrect use of this function can lead to memory leaks.
* so the same optimizations can occur. * It is recommended to use gst_buffer_join() instead of this function.
*
* If the buffers point to contiguous areas of memory, the buffer
* is created without copying the data.
* *
* Returns: the new #GstBuffer that's the concatenation of the source buffers. * Returns: the new #GstBuffer that's the concatenation of the source buffers.
*/ */
@ -334,6 +337,33 @@ gst_buffer_merge (GstBuffer * buf1, GstBuffer * buf2)
return result; return result;
} }
/**
* gst_buffer_join:
* @buf1: a first source #GstBuffer to merge.
* @buf2: the second source #GstBuffer to merge.
*
* Create a new buffer that is the concatenation of the two source
* buffers. The original buffers are unreferenced.
*
* If the buffers point to contiguous areas of memory, the buffer
* is created without copying the data.
*
* Returns: the new #GstBuffer that's the concatenation of the source buffers.
*/
GstBuffer *
gst_buffer_join (GstBuffer * buf1, GstBuffer * buf2)
{
GstBuffer *result;
/* we're just a specific case of the more general gst_buffer_span() */
result = gst_buffer_span (buf1, 0, buf2, buf1->size + buf2->size);
gst_buffer_unref (buf1);
gst_buffer_unref (buf2);
return result;
}
/** /**
* gst_buffer_is_span_fast: * gst_buffer_is_span_fast:
* @buf1: a first source #GstBuffer. * @buf1: a first source #GstBuffer.

1
gst/gstbuffer.h
View file

@ -138,6 +138,7 @@ GstBuffer* gst_buffer_create_sub (GstBuffer *parent, guint offset, guint size);
/* merge, span, or append two buffers, intelligently */ /* merge, span, or append two buffers, intelligently */
GstBuffer* gst_buffer_merge (GstBuffer *buf1, GstBuffer *buf2); GstBuffer* gst_buffer_merge (GstBuffer *buf1, GstBuffer *buf2);
GstBuffer* gst_buffer_join (GstBuffer *buf1, GstBuffer *buf2);
gboolean gst_buffer_is_span_fast (GstBuffer *buf1, GstBuffer *buf2); gboolean gst_buffer_is_span_fast (GstBuffer *buf1, GstBuffer *buf2);
GstBuffer* gst_buffer_span (GstBuffer *buf1, guint32 offset, GstBuffer *buf2, guint32 len); GstBuffer* gst_buffer_span (GstBuffer *buf1, guint32 offset, GstBuffer *buf2, guint32 len);