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

videometa: adjust for memory api change

Browse source
This commit is contained in:
Wim Taymans 2012-02-13 17:07:25 +01:00
parent bf476953f4
commit 6c51a80f6f
1 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gst-libs/gst/video/gstvideometa.c
View file

@ -164,27 +164,48 @@ gst_buffer_add_video_meta_full (GstBuffer * buffer, GstVideoFlags flags,
return meta; return meta;
} }
static GstMemory * static gboolean
find_mem_for_offset (GstBuffer * buffer, guint * offset, GstMapFlags flags) map_mem_for_offset (GstBuffer * buffer, guint * offset, GstMapInfo * info,
GstMapFlags flags)
{ {
guint n, i; guint n, i;
GstMemory *res = NULL;
n = gst_buffer_n_memory (buffer); if ((n = gst_buffer_n_memory (buffer)) == 0)
goto no_memory;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
GstMemory *mem = NULL; GstMemory *mem = NULL;
gsize size; gsize size;
mem = gst_buffer_peek_memory (buffer, i, flags); mem = gst_buffer_get_memory (buffer, i);
size = gst_memory_get_sizes (mem, NULL, NULL); size = gst_memory_get_sizes (mem, NULL, NULL);
if (*offset < size) { if (*offset < size) {
res = mem; GstMemory *mapped;
if (!(mapped = gst_memory_make_mapped (mem, info, flags)))
goto cannot_map;
if (mapped != mem && (flags & GST_MAP_WRITE))
gst_buffer_replace_memory (buffer, i, gst_memory_ref (mapped));
break; break;
} }
*offset -= size; *offset -= size;
gst_memory_unref (mem);
}
return TRUE;
/* ERRORS */
no_memory:
{
GST_DEBUG ("no memory");
return FALSE;
}
cannot_map:
{
GST_DEBUG ("cannot map memory");
return FALSE;
} }
return res;
} }
/** /**
@ -207,7 +228,6 @@ gst_video_meta_map (GstVideoMeta * meta, guint plane, GstMapInfo * info,
guint offset; guint offset;
gboolean write, res; gboolean write, res;
GstBuffer *buffer; GstBuffer *buffer;
GstMemory *mem;
g_return_val_if_fail (meta != NULL, FALSE); g_return_val_if_fail (meta != NULL, FALSE);
g_return_val_if_fail (plane < meta->n_planes, FALSE); g_return_val_if_fail (plane < meta->n_planes, FALSE);
@ -224,14 +244,13 @@ gst_video_meta_map (GstVideoMeta * meta, guint plane, GstMapInfo * info,
*stride = meta->stride[plane]; *stride = meta->stride[plane];
/* find the memory block for this plane, this is the memory block containing /* find the memory block for this plane, this is the memory block containing
* the plane offset */ * the plane offset */
mem = find_mem_for_offset (buffer, &offset, flags); res = map_mem_for_offset (buffer, &offset, info, flags);
if (G_LIKELY (res)) {
res = gst_memory_map (mem, info, flags);
/* move to the right offset inside the block */ /* move to the right offset inside the block */
info->data += offset; info->data += offset;
info->size -= offset; info->size -= offset;
info->maxsize -= offset; info->maxsize -= offset;
}
return res; return res;
} }
@ -251,7 +270,6 @@ gst_video_meta_unmap (GstVideoMeta * meta, guint plane, GstMapInfo * info)
{ {
guint offset; guint offset;
GstBuffer *buffer; GstBuffer *buffer;
GstMemory *mem;
g_return_val_if_fail (meta != NULL, FALSE); g_return_val_if_fail (meta != NULL, FALSE);
g_return_val_if_fail (plane < meta->n_planes, FALSE); g_return_val_if_fail (plane < meta->n_planes, FALSE);
@ -261,14 +279,14 @@ gst_video_meta_unmap (GstVideoMeta * meta, guint plane, GstMapInfo * info)
g_return_val_if_fail (buffer != NULL, FALSE); g_return_val_if_fail (buffer != NULL, FALSE);
offset = meta->offset[plane]; offset = meta->offset[plane];
mem = find_mem_for_offset (buffer, &offset, GST_MAP_READ);
/* move to the right offset inside the block */ /* move to the right offset inside the block */
info->data -= offset; info->data -= offset;
info->size += offset; info->size += offset;
info->maxsize += offset; info->maxsize += offset;
gst_memory_unmap (mem, info); gst_memory_unmap (info->memory, info);
gst_memory_unref (info->memory);
return TRUE; return TRUE;
} }