mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

buffer: If sharing a GstMemory fails, fall back to copying it

Browse source
This commit is contained in:
Sebastian Dröge 2013-02-24 09:33:03 +01:00
parent 5125185c4c
commit 209f081ab8
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gst/gstbuffer.c
View file

@ -201,7 +201,7 @@ _is_span (GstMemory ** mem, gsize len, gsize * poffset, GstMemory ** parent)
static GstMemory * static GstMemory *
_get_merged_memory (GstBuffer * buffer, guint idx, guint length) _get_merged_memory (GstBuffer * buffer, guint idx, guint length)
{ {
GstMemory **mem, *result; GstMemory **mem, *result = NULL;
GST_CAT_LOG (GST_CAT_BUFFER, "buffer %p, idx %u, length %u", buffer, idx, GST_CAT_LOG (GST_CAT_BUFFER, "buffer %p, idx %u, length %u", buffer, idx,
length); length);
@ -219,12 +219,14 @@ _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))
result = gst_memory_share (parent, poffset, size);
if (!result) {
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);
} else {
result = gst_memory_share (parent, poffset, size);
} }
g_return_val_if_fail (result != NULL, NULL);
} else { } else {
gsize i, tocopy, left; gsize i, tocopy, left;
GstMapInfo sinfo, dinfo; GstMapInfo sinfo, dinfo;
@ -422,18 +424,24 @@ gst_buffer_copy_into (GstBuffer * dest, GstBuffer * src,
gsize tocopy; gsize tocopy;
tocopy = MIN (bsize - skip, left); tocopy = MIN (bsize - skip, left);
if (deep || GST_MEMORY_IS_NO_SHARE (mem)) {
if (tocopy < bsize && (!deep || !GST_MEMORY_IS_NO_SHARE (mem))) {
/* we need to clip something */
mem = gst_memory_share (mem, skip, tocopy);
skip = 0;
}
if (deep || GST_MEMORY_IS_NO_SHARE (mem) || (!mem && tocopy < bsize)) {
/* deep copy or we're not allowed to share this memory /* deep copy or we're not allowed to share this memory
* between buffers, always copy then */ * between buffers, always copy then */
mem = gst_memory_copy (mem, skip, tocopy); mem = gst_memory_copy (mem, skip, tocopy);
skip = 0; skip = 0;
} else if (tocopy < bsize) {
/* we need to clip something */
mem = gst_memory_share (mem, skip, tocopy);
skip = 0;
} else { } else {
mem = gst_memory_ref (mem); mem = gst_memory_ref (mem);
} }
g_return_if_fail (mem != NULL);
_memory_add (dest, -1, mem, TRUE); _memory_add (dest, -1, mem, TRUE);
left -= tocopy; left -= tocopy;
} }
@ -1323,13 +1331,16 @@ gst_buffer_resize_range (GstBuffer * buffer, guint idx, gint length,
if (gst_memory_is_writable (mem)) { if (gst_memory_is_writable (mem)) {
gst_memory_resize (mem, offset, left); gst_memory_resize (mem, offset, left);
} else { } else {
GstMemory *newmem; GstMemory *newmem = NULL;
if (GST_MEMORY_IS_NO_SHARE (mem)) if (!GST_MEMORY_IS_NO_SHARE (mem))
newmem = gst_memory_copy (mem, offset, left);
else
newmem = gst_memory_share (mem, offset, left); newmem = gst_memory_share (mem, offset, left);
if (!newmem)
newmem = gst_memory_copy (mem, offset, left);
g_return_if_fail (newmem != NULL);
gst_memory_lock (newmem, GST_LOCK_FLAG_EXCLUSIVE); gst_memory_lock (newmem, GST_LOCK_FLAG_EXCLUSIVE);
GST_BUFFER_MEM_PTR (buffer, i) = newmem; GST_BUFFER_MEM_PTR (buffer, i) = newmem;
gst_memory_unlock (mem, GST_LOCK_FLAG_EXCLUSIVE); gst_memory_unlock (mem, GST_LOCK_FLAG_EXCLUSIVE);