mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

buffer: we always call _span with the buffer size

Browse source
This commit is contained in:
Wim Taymans 2012-03-28 15:16:01 +02:00
parent 127074986c
commit 315e77bf81
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/gstbuffer.c
View file

@ -241,17 +241,16 @@ _arr_span (GstMemory ** mem[], gsize len[], guint n, gsize size)
} }
static GstMemory * static GstMemory *
_span_memory (GstBuffer * buffer, gsize size) _span_memory (GstBuffer * buffer)
{ {
GstMemory *span, **mem[1]; GstMemory *span, **mem[1];
gsize len[1]; gsize size, len[1];
/* not enough room, span buffers */ /* not enough room, span buffers */
mem[0] = GST_BUFFER_MEM_ARRAY (buffer); mem[0] = GST_BUFFER_MEM_ARRAY (buffer);
len[0] = GST_BUFFER_MEM_LEN (buffer); len[0] = GST_BUFFER_MEM_LEN (buffer);
if (size == -1) size = gst_buffer_get_size (buffer);
size = gst_buffer_get_size (buffer);
span = _arr_span (mem, len, 1, size); span = _arr_span (mem, len, 1, size);
@ -276,7 +275,7 @@ _get_merged_memory (GstBuffer * buffer, gboolean * merged)
*merged = FALSE; *merged = FALSE;
} else { } else {
/* we need to span memory */ /* we need to span memory */
mem = _span_memory (buffer, -1); mem = _span_memory (buffer);
*merged = TRUE; *merged = TRUE;
} }
return mem; return mem;
@ -316,7 +315,7 @@ _memory_add (GstBuffer * buffer, guint idx, GstMemory * mem)
* could try to only merge the two smallest buffers to avoid memcpy, etc. */ * could try to only merge the two smallest buffers to avoid memcpy, etc. */
GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "memory array overflow in buffer %p", GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "memory array overflow in buffer %p",
buffer); buffer);
_replace_all_memory (buffer, _span_memory (buffer, -1)); _replace_all_memory (buffer, _span_memory (buffer));
/* we now have 1 single spanned buffer */ /* we now have 1 single spanned buffer */
len = 1; len = 1;
} }
@ -446,7 +445,7 @@ gst_buffer_copy_into (GstBuffer * dest, GstBuffer * src,
} }
} }
if (flags & GST_BUFFER_COPY_MERGE) { if (flags & GST_BUFFER_COPY_MERGE) {
_replace_all_memory (dest, _span_memory (dest, size)); _replace_all_memory (dest, _span_memory (dest));
} }
} }