From: Matthew Waters <ystreet00@gmail.com>
Date: Tue, 6 May 2014 06:31:28 +0000 (+1000)
Subject: gl/display: check the correct env variable for choosing an egl display
X-Git-Tag: 1.19.3~511^2~1989^2~1516
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=320ceef471d78397e41fd1b416bb7d7108e2adda;p=platform%2Fupstream%2Fgstreamer.git

gl/display: check the correct env variable for choosing an egl display

GST_GL_WINDOW is used for window system specific choices.
An EGLDisplay can be created from window systems with egl support by using
eglGetDisplay().

https://bugzilla.gnome.org/show_bug.cgi?id=729551
---

diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
index 20cb51e..b6b46d5 100644
--- a/gst-libs/gst/gl/gstgldisplay.c
+++ b/gst-libs/gst/gl/gstgldisplay.c
@@ -120,7 +120,7 @@ GstGLDisplay *
 gst_gl_display_new (void)
 {
   GstGLDisplay *display = NULL;
-  const gchar *user_choice;
+  const gchar *user_choice, *platform_choice;
   static volatile gsize _init = 0;
 
   if (g_once_init_enter (&_init)) {
@@ -130,6 +130,7 @@ gst_gl_display_new (void)
   }
 
   user_choice = g_getenv ("GST_GL_WINDOW");
+  platform_choice = g_getenv ("GST_GL_PLATFORM");
   GST_INFO ("creating a window, user choice:%s", user_choice);
 
 #if GST_GL_HAVE_WINDOW_X11
@@ -137,7 +138,8 @@ gst_gl_display_new (void)
     display = GST_GL_DISPLAY (gst_gl_display_x11_new (NULL));
 #endif
 #if GST_GL_HAVE_PLATFORM_EGL
-  if (!display && (!user_choice || g_strstr_len (user_choice, 3, "egl")))
+  if (!display && (!platform_choice
+          || g_strstr_len (platform_choice, 3, "egl")))
     display = GST_GL_DISPLAY (gst_gl_display_egl_new ());
 #endif
   if (!display) {