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

dmabuf: don't touch the GstMemory size

Browse source 
mem.size is the content size and should not be touch.
Save the mmap size instead.

https://bugzilla.gnome.org/show_bug.cgi?id=699566
This commit is contained in:
Michael Olbrich 2013-05-03 11:23:59 +02:00 committed by Sebastian Dröge
parent a4ba85b151
commit 25dd73521d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/allocators/gstdmabuf.c
View file

@ -52,6 +52,7 @@ typedef struct
gpointer data;
gint mmapping_flags;
gint mmap_count;
gsize mmap_size;
GMutex lock;
} GstDmaBufMemory;
@ -90,7 +91,7 @@ gst_dmabuf_mem_map (GstMemory * gmem, gsize maxsize, GstMapFlags flags)
if (mem->data) {
/* only return address if mapping flags are a subset
* of the previous flags */
if (mem->mmapping_flags & prot)
if ((mem->mmapping_flags & prot) && (mem->mmap_size >= maxsize))
ret = mem->data;
goto out;
@ -110,7 +111,7 @@ gst_dmabuf_mem_map (GstMemory * gmem, gsize maxsize, GstMapFlags flags)
if (mem->data) {
mem->mmapping_flags = prot;
mem->mem.size = maxsize;
mem->mmap_size = maxsize;
mem->mmap_count++;
ret = mem->data;
}
@ -127,9 +128,9 @@ gst_dmabuf_mem_unmap (GstMemory * gmem)
g_mutex_lock (&mem->lock);
if (mem->data && !(--mem->mmap_count)) {
munmap ((void *) mem->data, mem->mem.size);
munmap ((void *) mem->data, mem->mmap_size);
mem->data = NULL;
mem->mem.size = 0;
mem->mmap_size = 0;
mem->mmapping_flags = 0;
GST_DEBUG ("%p: fd %d unmapped", mem, mem->fd);
}
@ -151,7 +152,7 @@ gst_dmabuf_mem_share (GstMemory * gmem, gssize offset, gssize size)
parent = (GstMemory *) mem;
if (size == -1)
size = mem->mem.size - offset;
size = gmem->maxsize - offset;
sub = g_slice_new0 (GstDmaBufMemory);
/* the shared memory is always readonly */