Commit e4a58ec7 authored by Wim Taymans's avatar Wim Taymans

memory: improve semantics of unmap

Make an unmap call with a different data pointer than the map call update the
offset field. This allows for both offset and size adjustements in the unmap
call.
parent d483ff2d
......@@ -217,13 +217,10 @@ _default_mem_unmap (GstMemoryDefault * mem, gpointer data, gsize size)
g_return_val_if_fail ((guint8 *) data >= mem->data
&& (guint8 *) data < mem->data + mem->maxsize, FALSE);
if (size != -1) {
/* check if resize happened or unmap was called with different data */
if (mem->data + mem->offset != data) {
/* adjust the size */
size = (guint8 *) data - mem->data + size - mem->offset;
}
if (mem->data + mem->offset != data)
mem->offset = (guint8 *) data - mem->data;
if (size != -1) {
g_return_val_if_fail (mem->offset + size <= mem->maxsize, FALSE);
mem->size = size;
}
......@@ -487,6 +484,9 @@ gst_memory_map (GstMemory * mem, gsize * size, gsize * maxsize,
* the memory to @size. @size can be set to -1 when the size should not be
* updated.
*
* It is possible to pass a different @data than that obtained from
* gst_memory_map() in which case the offset of @mem will be updated.
*
* Returns: TRUE when the memory was release successfully.
*/
gboolean
......
......@@ -479,7 +479,7 @@ GST_END_TEST;
GST_START_TEST (test_map_resize)
{
GstMemory *mem;
gsize size, maxsize;
gsize size, maxsize, maxalloc, offset;
gpointer data;
mem = gst_allocator_alloc (NULL, 100, 0);
......@@ -490,10 +490,42 @@ GST_START_TEST (test_map_resize)
fail_unless (size == 100);
/* resize the buffer */
gst_memory_resize (mem, 1, maxsize - 1);
gst_memory_resize (mem, 1, size - 1);
size = gst_memory_get_sizes (mem, &offset, &maxalloc);
fail_unless (size == 99);
fail_unless (offset == 1);
fail_unless (maxalloc >= 100);
/* unmap the buffer with original pointer and size */
gst_memory_unmap (mem, data, maxsize);
/* unmap the buffer with original pointer and size, should restore the offset
* and size */
gst_memory_unmap (mem, data, 100);
size = gst_memory_get_sizes (mem, &offset, &maxalloc);
fail_unless (size == 100);
fail_unless (offset == 0);
fail_unless (maxalloc >= 100);
data = gst_memory_map (mem, &size, &maxsize, GST_MAP_READ);
fail_unless (data != NULL);
fail_unless (size == 100);
fail_unless (maxsize >= 100);
/* resize the buffer with unmap */
gst_memory_unmap (mem, (guint8 *) data + 1, 99);
size = gst_memory_get_sizes (mem, &offset, &maxalloc);
fail_unless (size == 99);
fail_unless (offset == 1);
fail_unless (maxalloc >= 100);
/* and larger */
data = gst_memory_map (mem, &size, &maxsize, GST_MAP_READ);
gst_memory_unmap (mem, (guint8 *) data - 1, 100);
size = gst_memory_get_sizes (mem, &offset, &maxalloc);
fail_unless (size == 100);
fail_unless (offset == 0);
fail_unless (maxalloc >= 100);
gst_memory_unref (mem);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment