mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-20 13:06:23 +00:00
eglglessink: prepare gst_egl_adaptation_allocate_eglimage to be moved
into gstegl lib or splited between gstegl lib and gstgl lib because it both depends on egl and gl So it has to not depend on GstEglAdaptationContext
This commit is contained in:
Julien Isorce
parent
31d1c05871
commit
c0ca9bc422
3 changed files with 54 additions and 32 deletions
|
|
@ -184,6 +184,10 @@ void gst_egl_adaptation_destroy_context (GstEglAdaptationContext * ctx);
|
|||
gboolean
|
||||
gst_egl_adaptation_create_egl_context (GstEglAdaptationContext * ctx);
|
||||
|
||||
#ifndef HAVE_IOS
|
||||
EGLContext gst_egl_adaptation_context_get_egl_context (GstEglAdaptationContext * ctx);
|
||||
#endif
|
||||
|
||||
/* platform window */
|
||||
gboolean gst_egl_adaptation_create_native_window (GstEglAdaptationContext
|
||||
* ctx, gint width, gint height, gpointer * own_window_data);
|
||||
|
|
@ -205,12 +209,20 @@ void gst_egl_adaptation_set_window (GstEglAdaptationContext * ctx, guintptr wind
|
|||
gboolean gst_egl_adaptation_context_make_current (GstEglAdaptationContext * ctx, gboolean bind);
|
||||
void gst_egl_adaptation_cleanup (GstEglAdaptationContext * ctx);
|
||||
|
||||
GstBuffer *
|
||||
gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx, GstAllocator * allocator,
|
||||
GstVideoFormat format, gint width, gint height);
|
||||
gboolean
|
||||
gst_egl_adaptation_context_swap_buffers (GstEglAdaptationContext * ctx);
|
||||
|
||||
#ifndef HAVE_IOS
|
||||
/* TODO: The goal is to move this function to gstegl lib (or
|
||||
* splitted between gstegl lib and gstgl lib) in order to be used in
|
||||
* webkitVideoSink
|
||||
* So it has to be independent of GstEglAdaptationContext */
|
||||
GstBuffer *
|
||||
gst_egl_image_allocator_alloc_eglimage (GstAllocator * allocator,
|
||||
GstEGLDisplay * display, EGLContext eglcontext, GstVideoFormat format,
|
||||
gint width, gint height);
|
||||
#endif
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GST_EGL_ADAPTATION_H__ */
|
||||
|
|
|
|||
|
|
@ -395,6 +395,14 @@ gst_egl_adaptation_create_egl_context (GstEglAdaptationContext * ctx)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
EGLContext
|
||||
gst_egl_adaptation_context_get_egl_context (GstEglAdaptationContext * ctx)
|
||||
{
|
||||
g_return_val_if_fail (ctx != NULL, EGL_NO_CONTEXT);
|
||||
|
||||
return ctx->eglglesctx->eglcontext;
|
||||
}
|
||||
|
||||
static void
|
||||
gst_egl_gles_image_data_free (GstEGLGLESImageData * data)
|
||||
{
|
||||
|
|
@ -404,8 +412,9 @@ gst_egl_gles_image_data_free (GstEGLGLESImageData * data)
|
|||
|
||||
|
||||
GstBuffer *
|
||||
gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
||||
GstAllocator * allocator, GstVideoFormat format, gint width, gint height)
|
||||
gst_egl_image_allocator_alloc_eglimage (GstAllocator * allocator,
|
||||
GstEGLDisplay * display, EGLContext eglcontext, GstVideoFormat format,
|
||||
gint width, gint height)
|
||||
{
|
||||
GstEGLGLESImageData *data = NULL;
|
||||
GstBuffer *buffer;
|
||||
|
|
@ -434,7 +443,7 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
EGLImageKHR image;
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_RGB, GST_VIDEO_INFO_WIDTH (&info),
|
||||
GST_VIDEO_INFO_HEIGHT (&info), &size);
|
||||
if (mem[0]) {
|
||||
|
|
@ -475,14 +484,14 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
goto mem_error;
|
||||
|
||||
image =
|
||||
eglCreateImageKHR (gst_egl_display_get (ctx->display),
|
||||
ctx->eglglesctx->eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
eglCreateImageKHR (gst_egl_display_get (display),
|
||||
eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
(EGLClientBuffer) (guintptr) data->texture, NULL);
|
||||
if (got_egl_error ("eglCreateImageKHR"))
|
||||
goto mem_error;
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_wrap (allocator, ctx->display,
|
||||
gst_egl_image_allocator_wrap (allocator, display,
|
||||
image, GST_VIDEO_GL_TEXTURE_TYPE_RGB,
|
||||
flags, size, data, (GDestroyNotify) gst_egl_gles_image_data_free);
|
||||
n_mem = 1;
|
||||
|
|
@ -494,7 +503,7 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
gsize size;
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_RGB, GST_VIDEO_INFO_WIDTH (&info),
|
||||
GST_VIDEO_INFO_HEIGHT (&info), &size);
|
||||
if (mem[0]) {
|
||||
|
|
@ -536,14 +545,14 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
goto mem_error;
|
||||
|
||||
image =
|
||||
eglCreateImageKHR (gst_egl_display_get (ctx->display),
|
||||
ctx->eglglesctx->eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
eglCreateImageKHR (gst_egl_display_get (display),
|
||||
eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
(EGLClientBuffer) (guintptr) data->texture, NULL);
|
||||
if (got_egl_error ("eglCreateImageKHR"))
|
||||
goto mem_error;
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_wrap (allocator, ctx->display,
|
||||
gst_egl_image_allocator_wrap (allocator, display,
|
||||
image, GST_VIDEO_GL_TEXTURE_TYPE_RGB,
|
||||
flags, size, data, (GDestroyNotify) gst_egl_gles_image_data_free);
|
||||
n_mem = 1;
|
||||
|
|
@ -556,11 +565,11 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
gsize size[2];
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE, GST_VIDEO_INFO_COMP_WIDTH (&info,
|
||||
0), GST_VIDEO_INFO_COMP_HEIGHT (&info, 0), &size[0]);
|
||||
mem[1] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE_ALPHA,
|
||||
GST_VIDEO_INFO_COMP_WIDTH (&info, 1),
|
||||
GST_VIDEO_INFO_COMP_HEIGHT (&info, 1), &size[1]);
|
||||
|
|
@ -624,14 +633,14 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
goto mem_error;
|
||||
|
||||
image =
|
||||
eglCreateImageKHR (gst_egl_display_get (ctx->display),
|
||||
ctx->eglglesctx->eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
eglCreateImageKHR (gst_egl_display_get (display),
|
||||
eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
(EGLClientBuffer) (guintptr) data->texture, NULL);
|
||||
if (got_egl_error ("eglCreateImageKHR"))
|
||||
goto mem_error;
|
||||
|
||||
mem[i] =
|
||||
gst_egl_image_allocator_wrap (allocator, ctx->display,
|
||||
gst_egl_image_allocator_wrap (allocator, display,
|
||||
image,
|
||||
(i ==
|
||||
0 ? GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE :
|
||||
|
|
@ -653,15 +662,15 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
gsize size[3];
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE, GST_VIDEO_INFO_COMP_WIDTH (&info,
|
||||
0), GST_VIDEO_INFO_COMP_HEIGHT (&info, 0), &size[0]);
|
||||
mem[1] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE, GST_VIDEO_INFO_COMP_WIDTH (&info,
|
||||
1), GST_VIDEO_INFO_COMP_HEIGHT (&info, 1), &size[1]);
|
||||
mem[2] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE, GST_VIDEO_INFO_COMP_WIDTH (&info,
|
||||
2), GST_VIDEO_INFO_COMP_HEIGHT (&info, 2), &size[2]);
|
||||
|
||||
|
|
@ -727,14 +736,14 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
goto mem_error;
|
||||
|
||||
image =
|
||||
eglCreateImageKHR (gst_egl_display_get (ctx->display),
|
||||
ctx->eglglesctx->eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
eglCreateImageKHR (gst_egl_display_get (display),
|
||||
eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
(EGLClientBuffer) (guintptr) data->texture, NULL);
|
||||
if (got_egl_error ("eglCreateImageKHR"))
|
||||
goto mem_error;
|
||||
|
||||
mem[i] =
|
||||
gst_egl_image_allocator_wrap (allocator, ctx->display,
|
||||
gst_egl_image_allocator_wrap (allocator, display,
|
||||
image, GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE,
|
||||
flags, size[i], data,
|
||||
(GDestroyNotify) gst_egl_gles_image_data_free);
|
||||
|
|
@ -757,7 +766,7 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
EGLImageKHR image;
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_alloc (allocator, ctx->display,
|
||||
gst_egl_image_allocator_alloc (allocator, display,
|
||||
GST_VIDEO_GL_TEXTURE_TYPE_RGBA, GST_VIDEO_INFO_WIDTH (&info),
|
||||
GST_VIDEO_INFO_HEIGHT (&info), &size);
|
||||
if (mem[0]) {
|
||||
|
|
@ -798,14 +807,14 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
goto mem_error;
|
||||
|
||||
image =
|
||||
eglCreateImageKHR (gst_egl_display_get (ctx->display),
|
||||
ctx->eglglesctx->eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
eglCreateImageKHR (gst_egl_display_get (display),
|
||||
eglcontext, EGL_GL_TEXTURE_2D_KHR,
|
||||
(EGLClientBuffer) (guintptr) data->texture, NULL);
|
||||
if (got_egl_error ("eglCreateImageKHR"))
|
||||
goto mem_error;
|
||||
|
||||
mem[0] =
|
||||
gst_egl_image_allocator_wrap (allocator, ctx->display,
|
||||
gst_egl_image_allocator_wrap (allocator, display,
|
||||
image, GST_VIDEO_GL_TEXTURE_TYPE_RGBA,
|
||||
flags, size, data, (GDestroyNotify) gst_egl_gles_image_data_free);
|
||||
|
||||
|
|
@ -829,7 +838,7 @@ gst_egl_adaptation_allocate_eglimage (GstEglAdaptationContext * ctx,
|
|||
|
||||
mem_error:
|
||||
{
|
||||
GST_ERROR_OBJECT (ctx->element, "Failed to create EGLImage");
|
||||
GST_ERROR_OBJECT (GST_CAT_DEFAULT, "Failed to create EGLImage");
|
||||
|
||||
if (data)
|
||||
gst_egl_gles_image_data_free (data);
|
||||
|
|
|
|||
|
|
@ -535,9 +535,10 @@ render_thread_func (GstEglGlesSink * eglglessink)
|
|||
}
|
||||
|
||||
buffer =
|
||||
gst_egl_adaptation_allocate_eglimage (eglglessink->egl_context,
|
||||
GST_EGL_IMAGE_BUFFER_POOL (eglglessink->pool)->allocator, format,
|
||||
width, height);
|
||||
gst_egl_image_allocator_alloc_eglimage (GST_EGL_IMAGE_BUFFER_POOL
|
||||
(eglglessink->pool)->allocator, eglglessink->egl_context->display,
|
||||
gst_egl_adaptation_context_get_egl_context
|
||||
(eglglessink->egl_context), format, width, height);
|
||||
g_value_init (&v, G_TYPE_POINTER);
|
||||
g_value_set_pointer (&v, buffer);
|
||||
gst_structure_set_value (s, "buffer", &v);
|
||||
|
|
|
|||
Loading…
Reference in a new issue