mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-01 03:52:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

eglglessink: Make sure to set the NO_SHARE flag on the EGLImage memories

Browse source 
See https://bugzilla.gnome.org/show_bug.cgi?id=695203
This commit is contained in:
Sebastian Dröge 2013-03-06 10:53:59 +01:00
parent ebe5849443
commit a50700404a
1 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ext/eglgles/gsteglglessink.c
View file

@ -2889,10 +2889,16 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
gsize offset[3]; gsize offset[3];
GstMemory *mem[3] = { NULL, NULL, NULL }; GstMemory *mem[3] = { NULL, NULL, NULL };
guint n_mem; guint n_mem;
GstMemoryFlags flags = 0;
memset (stride, 0, sizeof (stride)); memset (stride, 0, sizeof (stride));
memset (offset, 0, sizeof (offset)); memset (offset, 0, sizeof (offset));
if (!gst_egl_image_memory_is_mappable ())
flags |= GST_MEMORY_FLAG_NOT_MAPPABLE;
/* See https://bugzilla.gnome.org/show_bug.cgi?id=695203 */
flags |= GST_MEMORY_FLAG_NO_SHARE;
gst_video_info_set_format (&info, format, width, height); gst_video_info_set_format (&info, format, width, height);
switch (format) { switch (format) {
@ -2909,6 +2915,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
if (mem[0]) { if (mem[0]) {
stride[0] = size / GST_VIDEO_INFO_HEIGHT (&info); stride[0] = size / GST_VIDEO_INFO_HEIGHT (&info);
n_mem = 1; n_mem = 1;
GST_MINI_OBJECT_FLAG_SET (mem[0], GST_MEMORY_FLAG_NO_SHARE);
} else { } else {
data = g_slice_new0 (GstEGLGLESImageData); data = g_slice_new0 (GstEGLGLESImageData);
@ -2954,9 +2961,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL
(eglglessink->pool)->allocator, eglglessink->eglglesctx.display, (eglglessink->pool)->allocator, eglglessink->eglglesctx.display,
image, GST_EGL_IMAGE_MEMORY_TYPE_RGB, image, GST_EGL_IMAGE_MEMORY_TYPE_RGB,
(gst_egl_image_memory_is_mappable ()? 0 : flags, size, data, (GDestroyNotify) gst_egl_gles_image_data_free);
GST_MEMORY_FLAG_NOT_MAPPABLE), size, data,
(GDestroyNotify) gst_egl_gles_image_data_free);
n_mem = 1; n_mem = 1;
} }
break; break;
@ -2973,6 +2978,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
if (mem[0]) { if (mem[0]) {
stride[0] = size / GST_VIDEO_INFO_HEIGHT (&info); stride[0] = size / GST_VIDEO_INFO_HEIGHT (&info);
n_mem = 1; n_mem = 1;
GST_MINI_OBJECT_FLAG_SET (mem[0], GST_MEMORY_FLAG_NO_SHARE);
} else { } else {
data = g_slice_new0 (GstEGLGLESImageData); data = g_slice_new0 (GstEGLGLESImageData);
@ -3019,9 +3025,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL
(eglglessink->pool)->allocator, eglglessink->eglglesctx.display, (eglglessink->pool)->allocator, eglglessink->eglglesctx.display,
image, GST_EGL_IMAGE_MEMORY_TYPE_RGB, image, GST_EGL_IMAGE_MEMORY_TYPE_RGB,
(gst_egl_image_memory_is_mappable ()? 0 : flags, size, data, (GDestroyNotify) gst_egl_gles_image_data_free);
GST_MEMORY_FLAG_NOT_MAPPABLE), size, data,
(GDestroyNotify) gst_egl_gles_image_data_free);
n_mem = 1; n_mem = 1;
} }
break; break;
@ -3048,6 +3052,8 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
offset[1] = size[0]; offset[1] = size[0];
stride[1] = size[1] / GST_VIDEO_INFO_HEIGHT (&info); stride[1] = size[1] / GST_VIDEO_INFO_HEIGHT (&info);
n_mem = 2; n_mem = 2;
GST_MINI_OBJECT_FLAG_SET (mem[0], GST_MEMORY_FLAG_NO_SHARE);
GST_MINI_OBJECT_FLAG_SET (mem[1], GST_MEMORY_FLAG_NO_SHARE);
} else { } else {
if (mem[0]) if (mem[0])
gst_memory_unref (mem[0]); gst_memory_unref (mem[0]);
@ -3113,8 +3119,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
(i == (i ==
0 ? GST_EGL_IMAGE_MEMORY_TYPE_LUMINANCE : 0 ? GST_EGL_IMAGE_MEMORY_TYPE_LUMINANCE :
GST_EGL_IMAGE_MEMORY_TYPE_LUMINANCE_ALPHA), GST_EGL_IMAGE_MEMORY_TYPE_LUMINANCE_ALPHA),
(gst_egl_image_memory_is_mappable ()? 0 : flags, size[i], data,
GST_MEMORY_FLAG_NOT_MAPPABLE), size[i], data,
(GDestroyNotify) gst_egl_gles_image_data_free); (GDestroyNotify) gst_egl_gles_image_data_free);
} }
@ -3153,6 +3158,9 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
offset[2] = size[1]; offset[2] = size[1];
stride[2] = size[2] / GST_VIDEO_INFO_HEIGHT (&info); stride[2] = size[2] / GST_VIDEO_INFO_HEIGHT (&info);
n_mem = 3; n_mem = 3;
GST_MINI_OBJECT_FLAG_SET (mem[0], GST_MEMORY_FLAG_NO_SHARE);
GST_MINI_OBJECT_FLAG_SET (mem[1], GST_MEMORY_FLAG_NO_SHARE);
GST_MINI_OBJECT_FLAG_SET (mem[2], GST_MEMORY_FLAG_NO_SHARE);
} else { } else {
if (mem[0]) if (mem[0])
gst_memory_unref (mem[0]); gst_memory_unref (mem[0]);
@ -3215,8 +3223,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL
(eglglessink->pool)->allocator, eglglessink->eglglesctx.display, (eglglessink->pool)->allocator, eglglessink->eglglesctx.display,
image, GST_EGL_IMAGE_MEMORY_TYPE_LUMINANCE, image, GST_EGL_IMAGE_MEMORY_TYPE_LUMINANCE,
(gst_egl_image_memory_is_mappable ()? 0 : flags, size[i], data,
GST_MEMORY_FLAG_NOT_MAPPABLE), size[i], data,
(GDestroyNotify) gst_egl_gles_image_data_free); (GDestroyNotify) gst_egl_gles_image_data_free);
} }
@ -3244,6 +3251,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
if (mem[0]) { if (mem[0]) {
stride[0] = size / GST_VIDEO_INFO_HEIGHT (&info); stride[0] = size / GST_VIDEO_INFO_HEIGHT (&info);
n_mem = 1; n_mem = 1;
GST_MINI_OBJECT_FLAG_SET (mem[0], GST_MEMORY_FLAG_NO_SHARE);
} else { } else {
data = g_slice_new0 (GstEGLGLESImageData); data = g_slice_new0 (GstEGLGLESImageData);
@ -3289,9 +3297,7 @@ gst_eglglessink_allocate_eglimage (GstEglGlesSink * eglglessink,
gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL gst_egl_image_allocator_wrap (GST_EGL_IMAGE_BUFFER_POOL
(eglglessink->pool)->allocator, eglglessink->eglglesctx.display, (eglglessink->pool)->allocator, eglglessink->eglglesctx.display,
image, GST_EGL_IMAGE_MEMORY_TYPE_RGBA, image, GST_EGL_IMAGE_MEMORY_TYPE_RGBA,
(gst_egl_image_memory_is_mappable ()? 0 : flags, size, data, (GDestroyNotify) gst_egl_gles_image_data_free);
GST_MEMORY_FLAG_NOT_MAPPABLE), size, data,
(GDestroyNotify) gst_egl_gles_image_data_free);
n_mem = 1; n_mem = 1;
} }