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

buffer: fix resize

Browse source 
Correctly update the exclusive locks
This commit is contained in:
Wim Taymans 2012-07-03 13:46:40 +02:00
parent 61a9de98d9
commit 703683f51b
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/gstbuffer.c
View file

@ -218,7 +218,6 @@ _get_merged_memory (GstBuffer * buffer, guint idx, guint length)
size = gst_buffer_get_size (buffer); size = gst_buffer_get_size (buffer);
if (G_UNLIKELY (_is_span (mem + idx, length, &poffset, &parent))) { if (G_UNLIKELY (_is_span (mem + idx, length, &poffset, &parent))) {
if (GST_MEMORY_IS_NO_SHARE (parent)) { if (GST_MEMORY_IS_NO_SHARE (parent)) {
GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy for merge %p", parent); GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy for merge %p", parent);
result = gst_memory_copy (parent, poffset, size); result = gst_memory_copy (parent, poffset, size);
@ -1177,7 +1176,6 @@ gst_buffer_resize_range (GstBuffer * buffer, guint idx, gint length,
{ {
guint i, len, end; guint i, len, end;
gsize bsize, bufsize, bufoffs, bufmax; gsize bsize, bufsize, bufoffs, bufmax;
GstMemory *mem;
g_return_if_fail (gst_buffer_is_writable (buffer)); g_return_if_fail (gst_buffer_is_writable (buffer));
g_return_if_fail (size >= -1); g_return_if_fail (size >= -1);
@ -1211,6 +1209,7 @@ gst_buffer_resize_range (GstBuffer * buffer, guint idx, gint length,
end = idx + length; end = idx + length;
/* copy and trim */ /* copy and trim */
for (i = idx; i < end; i++) { for (i = idx; i < end; i++) {
GstMemory *mem;
gsize left, noffs; gsize left, noffs;
mem = GST_BUFFER_MEM_PTR (buffer, i); mem = GST_BUFFER_MEM_PTR (buffer, i);
@ -1234,22 +1233,22 @@ gst_buffer_resize_range (GstBuffer * buffer, guint idx, gint length,
if (gst_memory_is_exclusive (mem)) { if (gst_memory_is_exclusive (mem)) {
gst_memory_resize (mem, offset, left); gst_memory_resize (mem, offset, left);
} else { } else {
GstMemory *tmp; GstMemory *newmem;
if (GST_MEMORY_IS_NO_SHARE (mem)) if (GST_MEMORY_IS_NO_SHARE (mem))
tmp = gst_memory_copy (mem, offset, left); newmem = gst_memory_copy (mem, offset, left);
else else
tmp = gst_memory_share (mem, offset, left); newmem = gst_memory_share (mem, offset, left);
gst_memory_lock (newmem, GST_LOCK_FLAG_EXCLUSIVE);
GST_BUFFER_MEM_PTR (buffer, i) = newmem;
gst_memory_unlock (mem, GST_LOCK_FLAG_EXCLUSIVE);
gst_memory_unref (mem); gst_memory_unref (mem);
mem = tmp;
} }
} }
offset = noffs; offset = noffs;
size -= left; size -= left;
/* FIXME, update exclusive counters */
GST_BUFFER_MEM_PTR (buffer, i) = mem;
} }
} }