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

glmemory: add some thread safety for gl operations

Browse source
This commit is contained in:
Matthew Waters 2015-01-27 12:15:43 +11:00 committed by Tim-Philipp Müller
parent d8cc4cfc47
commit 03135a2238
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/gl/gstglmemory.c
View file

@ -753,6 +753,8 @@ _gl_mem_init (GstGLMemory * mem, GstAllocator * allocator, GstMemory * parent,
mem->data_wrapped = FALSE; mem->data_wrapped = FALSE;
mem->texture_wrapped = FALSE; mem->texture_wrapped = FALSE;
g_mutex_init (&mem->lock);
_calculate_unpack_length (mem); _calculate_unpack_length (mem);
GST_CAT_DEBUG (GST_CAT_GL_MEMORY, "new GL texture memory:%p format:%u " GST_CAT_DEBUG (GST_CAT_GL_MEMORY, "new GL texture memory:%p format:%u "
@ -799,6 +801,8 @@ _gl_mem_map (GstGLMemory * gl_mem, gsize maxsize, GstMapFlags flags)
g_return_val_if_fail (maxsize == gl_mem->mem.maxsize, NULL); g_return_val_if_fail (maxsize == gl_mem->mem.maxsize, NULL);
g_mutex_lock (&gl_mem->lock);
if ((flags & GST_MAP_GL) == GST_MAP_GL) { if ((flags & GST_MAP_GL) == GST_MAP_GL) {
if ((flags & GST_MAP_READ) == GST_MAP_READ) { if ((flags & GST_MAP_READ) == GST_MAP_READ) {
GST_CAT_TRACE (GST_CAT_GL_MEMORY, "mapping GL texture:%u for reading", GST_CAT_TRACE (GST_CAT_GL_MEMORY, "mapping GL texture:%u for reading",
@ -842,19 +846,27 @@ _gl_mem_map (GstGLMemory * gl_mem, gsize maxsize, GstMapFlags flags)
gl_mem->map_flags = flags; gl_mem->map_flags = flags;
g_mutex_unlock (&gl_mem->lock);
return data; return data;
} }
void void
gst_gl_memory_download_transfer (GstGLMemory * gl_mem) gst_gl_memory_download_transfer (GstGLMemory * gl_mem)
{ {
g_mutex_lock (&gl_mem->lock);
gst_gl_context_thread_add (gl_mem->context, gst_gl_context_thread_add (gl_mem->context,
(GstGLContextThreadFunc) _transfer_download, gl_mem); (GstGLContextThreadFunc) _transfer_download, gl_mem);
g_mutex_unlock (&gl_mem->lock);
} }
static void static void
_gl_mem_unmap (GstGLMemory * gl_mem) _gl_mem_unmap (GstGLMemory * gl_mem)
{ {
g_mutex_lock (&gl_mem->lock);
if (gl_mem->map_flags & GST_MAP_WRITE) { if (gl_mem->map_flags & GST_MAP_WRITE) {
if (!(gl_mem->map_flags & GST_MAP_GL)) if (!(gl_mem->map_flags & GST_MAP_GL))
gst_gl_context_thread_add (gl_mem->context, gst_gl_context_thread_add (gl_mem->context,
@ -862,6 +874,8 @@ _gl_mem_unmap (GstGLMemory * gl_mem)
} }
gl_mem->map_flags = 0; gl_mem->map_flags = 0;
g_mutex_unlock (&gl_mem->lock);
} }
static void static void
@ -1017,6 +1031,8 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
{ {
GstGLMemory *dest; GstGLMemory *dest;
g_mutex_lock (&((GstGLMemory *) src)->lock);
if (GST_GL_MEMORY_FLAG_IS_SET (src, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) { if (GST_GL_MEMORY_FLAG_IS_SET (src, GST_GL_MEMORY_FLAG_NEED_UPLOAD)) {
dest = _gl_mem_new (src->mem.allocator, NULL, src->context, &src->info, dest = _gl_mem_new (src->mem.allocator, NULL, src->context, &src->info,
&src->valign, src->plane, NULL, NULL); &src->valign, src->plane, NULL, NULL);
@ -1061,6 +1077,8 @@ _gl_mem_copy (GstGLMemory * src, gssize offset, gssize size)
GST_GL_MEMORY_FLAG_SET (dest, GST_GL_MEMORY_FLAG_NEED_DOWNLOAD); GST_GL_MEMORY_FLAG_SET (dest, GST_GL_MEMORY_FLAG_NEED_DOWNLOAD);
} }
g_mutex_unlock (&((GstGLMemory *) src)->lock);
return (GstMemory *) dest; return (GstMemory *) dest;
} }
@ -1116,6 +1134,8 @@ _gl_mem_free (GstAllocator * allocator, GstMemory * mem)
gl_mem->data = NULL; gl_mem->data = NULL;
} }
g_mutex_clear (&gl_mem->lock);
gst_object_unref (gl_mem->context); gst_object_unref (gl_mem->context);
g_slice_free (GstGLMemory, gl_mem); g_slice_free (GstGLMemory, gl_mem);
} }

2
gst-libs/gst/gl/gstglmemory.h
View file

@ -102,6 +102,8 @@ struct _GstGLMemory
guint tex_width; guint tex_width;
guint transfer_pbo; guint transfer_pbo;
GstMapFlags map_flags; GstMapFlags map_flags;
GMutex lock;
}; };
#define GST_CAPS_FEATURE_MEMORY_GL_MEMORY "memory:GLMemory" #define GST_CAPS_FEATURE_MEMORY_GL_MEMORY "memory:GLMemory"