mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/eagl: fix eagl display creation

Browse source 
The GstGLDisplayType of the display was win32 instead of the required eagl.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1188>
This commit is contained in:
Matthew Waters 2021-10-19 19:46:48 +11:00 committed by GStreamer Marge Bot
parent 6cada5b064
commit d495154068
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-base/gst-libs/gst/gl/eagl/gstglcontext_eagl.m
View file

@ -105,7 +105,7 @@ gst_gl_context_eagl_new (GstGLDisplay * display)
if ((gst_gl_display_get_handle_type (display) & GST_GL_DISPLAY_TYPE_EAGL) if ((gst_gl_display_get_handle_type (display) & GST_GL_DISPLAY_TYPE_EAGL)
== GST_GL_DISPLAY_TYPE_NONE) { == GST_GL_DISPLAY_TYPE_NONE) {
GST_INFO ("Wrong display type %u for this window type %u", display->type, GST_INFO ("Wrong display type %u for this context type %u", display->type,
GST_GL_DISPLAY_TYPE_EAGL); GST_GL_DISPLAY_TYPE_EAGL);
return NULL; return NULL;
} }

8
subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c
View file

@ -408,12 +408,16 @@ gst_gl_display_new_with_type (GstGLDisplayType type)
#if GST_GL_HAVE_WINDOW_WIN32 || GST_GL_HAVE_WINDOW_EAGL #if GST_GL_HAVE_WINDOW_WIN32 || GST_GL_HAVE_WINDOW_EAGL
if (!display) { if (!display) {
GstGLDisplayType create_type = 0; GstGLDisplayType create_type = 0;
#if GST_GL_HAVE_WINDOW_WIN32
if (type & GST_GL_DISPLAY_TYPE_WIN32) if (type & GST_GL_DISPLAY_TYPE_WIN32)
create_type = GST_GL_DISPLAY_TYPE_WIN32; create_type = GST_GL_DISPLAY_TYPE_WIN32;
else if (type & GST_GL_DISPLAY_TYPE_EAGL) #endif
#if GST_GL_HAVE_WINDOW_EAGL
if (type & GST_GL_DISPLAY_TYPE_EAGL)
create_type = GST_GL_DISPLAY_TYPE_EAGL; create_type = GST_GL_DISPLAY_TYPE_EAGL;
#endif
if (create_type) { if (create_type) {
GST_INFO_OBJECT (display, "Creating display with type %u(0x%x)", GST_INFO ("Creating display with type %u(0x%x)",
create_type, create_type); create_type, create_type);
display = create_dummy_display (); display = create_dummy_display ();
display->type = create_type; display->type = create_type;