eglglessink: refactor egl functions/data to a separate file

This is part of the changes required to make
eglglessink work with both EGL and Apple's EAGL

ext/eglgles/Makefile.am

@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgsteglglessink.la
 
-libgsteglglessink_la_SOURCES = gsteglglessink.c video_platform_wrapper.c
+libgsteglglessink_la_SOURCES = gsteglglessink.c gstegladaptation.c video_platform_wrapper.c
 
 libgsteglglessink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
 			      $(GST_PLUGINS_BASE_CFLAGS) \
@@ -17,4 +17,4 @@ libgsteglglessink_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
 libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsteglglessink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
-noinst_HEADERS = gsteglglessink.h video_platform_wrapper.h
+noinst_HEADERS = gsteglglessink.h gstegladaptation.h video_platform_wrapper.h

ext/eglgles/gstegladaptation.h

@@ -0,0 +1,168 @@
+/*
+ * GStreamer EGL/GLES Sink Adaptation
+ * Copyright (C) 2012-2013 Collabora Ltd.
+ *   @author: Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com>
+ *   @author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *   @author: Thiago Santos <thiago.sousa.santos@collabora.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_EGL_ADAPTATION_H__
+#define __GST_EGL_ADAPTATION_H__
+
+#include <gst/gst.h>
+#include <gst/egl/egl.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+#define GST_EGLGLESSINK_EGL_MIN_VERSION 1
+
+G_BEGIN_DECLS
+
+typedef struct _GstEglAdaptationContext GstEglAdaptationContext;
+typedef struct _GstEglGlesRenderContext GstEglGlesRenderContext;
+typedef struct _GstEglGlesImageFmt GstEglGlesImageFmt;
+
+typedef struct _coord5
+{
+  float x;
+  float y;
+  float z;
+  float a;                      /* texpos x */
+  float b;                      /* texpos y */
+} coord5;
+
+/*
+ * GstEglGlesRenderContext:
+ * @config: Current EGL config
+ * @eglcontext: Current EGL context
+ * @display: Current EGL display connection
+ * @window: Current EGL window asociated with the display connection
+ * @used_window: Last seen EGL window asociated with the display connection
+ * @surface: EGL surface the sink is rendering into
+ * @fragshader: Fragment shader
+ * @vertshader: Vertex shader
+ * @glslprogram: Compiled and linked GLSL program in use for rendering
+ * @texture Texture units in use
+ * @surface_width: Pixel width of the surface the sink is rendering into
+ * @surface_height: Pixel height of the surface the sink is rendering into
+ * @pixel_aspect_ratio: EGL display aspect ratio
+ * @egl_minor: EGL version (minor)
+ * @egl_major: EGL version (major)
+ * @n_textures: Texture units count
+ * @position_loc: Index of the position vertex attribute array
+ * @texpos_loc: Index of the textpos vertex attribute array
+ * @position_array: VBO position array
+ * @texpos_array: VBO texpos array
+ * @index_array: VBO index array
+ * @position_buffer: Position buffer object name
+ * @texpos_buffer: Texpos buffer object name
+ * @index_buffer: Index buffer object name
+ *
+ * This struct holds the sink's EGL/GLES rendering context.
+ */
+struct _GstEglGlesRenderContext
+{
+  EGLConfig config;
+  EGLContext eglcontext;
+  GstEGLDisplay *display, *set_display;
+  EGLNativeWindowType window, used_window;
+  EGLSurface surface;
+  gboolean buffer_preserved;
+  GLuint fragshader[3]; /* frame, border, frame-custom */
+  GLuint vertshader[3]; /* frame, border, frame-custom */
+  GLuint glslprogram[3]; /* frame, border, frame-custom */
+  GLuint texture[4]; /* RGB/Y, U/UV, V, custom */
+  EGLint surface_width;
+  EGLint surface_height;
+  EGLint pixel_aspect_ratio;
+  EGLint egl_minor, egl_major;
+  gint n_textures;
+
+  /* shader vars */
+  GLuint position_loc[3]; /* frame, border, frame-custom */
+  GLuint texpos_loc[2]; /* frame, frame-custom */
+  GLuint tex_scale_loc[1][3]; /* [frame] RGB/Y, U/UV, V */
+  GLuint tex_loc[2][3]; /* [frame,frame-custom] RGB/Y, U/UV, V */
+  coord5 position_array[16];    /* 4 x Frame x-normal,y-normal, 4x Frame x-normal,y-flip, 4 x Border1, 4 x Border2 */
+  unsigned short index_array[4];
+  unsigned int position_buffer, index_buffer;
+};
+
+/*
+ * GstEglAdaptationContext:
+ * @have_vbo: Set if the GLES VBO setup has been performed
+ * @have_texture: Set if the GLES texture setup has been performed
+ * @have_surface: Set if the EGL surface setup has been performed
+ *  
+ * The #GstEglAdaptationContext data structure.
+ */
+struct _GstEglAdaptationContext
+{
+  GstElement *element;
+  GstEglGlesRenderContext eglglesctx;
+
+  gboolean have_vbo;
+  gboolean have_texture;
+  gboolean have_surface;
+};
+
+GstEglAdaptationContext * gst_egl_adaptation_context_new (GstElement * element);
+void gst_egl_adaptation_context_free (GstEglAdaptationContext * ctx);
+
+GstCaps *gst_egl_adaptation_fill_supported_fbuffer_configs (GstEglAdaptationContext * ctx);
+gboolean gst_egl_adaptation_init_egl_display (GstEglAdaptationContext * ctx);
+gboolean gst_egl_adaptation_choose_config (GstEglAdaptationContext * ctx);
+gboolean gst_egl_adaptation_init_egl_surface (GstEglAdaptationContext * ctx, GstVideoFormat format);
+void gst_egl_adaptation_init_egl_exts (GstEglAdaptationContext * ctx);
+gboolean gst_egl_adaptation_update_surface_dimensions (GstEglAdaptationContext * ctx);
+
+gboolean got_gl_error (const char *wtf);
+gboolean got_egl_error (const char *wtf);
+
+gboolean gst_egl_adaptation_context_make_current (GstEglAdaptationContext *
+    ctx, gboolean bind);
+void gst_egl_adaptation_wipe_eglglesctx (GstEglAdaptationContext * ctx);
+
+G_END_DECLS
+
+#endif /* __GST_EGL_ADAPTATION_H__ */

ext/eglgles/gsteglglessink.h

@@ -58,6 +58,7 @@
 #include <GLES2/gl2ext.h>
 
 #include "video_platform_wrapper.h"
+#include "gstegladaptation.h"
 
 G_BEGIN_DECLS
 #define GST_TYPE_EGLGLESSINK \
@@ -71,78 +72,8 @@ G_BEGIN_DECLS
 #define GST_IS_EGLGLESSINK_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_EGLGLESSINK))
 
-#define GST_EGLGLESSINK_EGL_MIN_VERSION 1
 typedef struct _GstEglGlesSink GstEglGlesSink;
 typedef struct _GstEglGlesSinkClass GstEglGlesSinkClass;
-typedef struct _GstEglGlesRenderContext GstEglGlesRenderContext;
-
-typedef struct _GstEglGlesImageFmt GstEglGlesImageFmt;
-
-typedef struct _coord5
-{
-  float x;
-  float y;
-  float z;
-  float a;                      /* texpos x */
-  float b;                      /* texpos y */
-} coord5;
-
-/*
- * GstEglGlesRenderContext:
- * @config: Current EGL config
- * @eglcontext: Current EGL context
- * @display: Current EGL display connection
- * @window: Current EGL window asociated with the display connection
- * @used_window: Last seen EGL window asociated with the display connection
- * @surface: EGL surface the sink is rendering into
- * @fragshader: Fragment shader
- * @vertshader: Vertex shader
- * @glslprogram: Compiled and linked GLSL program in use for rendering
- * @texture Texture units in use
- * @surface_width: Pixel width of the surface the sink is rendering into
- * @surface_height: Pixel height of the surface the sink is rendering into
- * @pixel_aspect_ratio: EGL display aspect ratio
- * @egl_minor: EGL version (minor)
- * @egl_major: EGL version (major)
- * @n_textures: Texture units count
- * @position_loc: Index of the position vertex attribute array
- * @texpos_loc: Index of the textpos vertex attribute array
- * @position_array: VBO position array
- * @texpos_array: VBO texpos array
- * @index_array: VBO index array
- * @position_buffer: Position buffer object name
- * @texpos_buffer: Texpos buffer object name
- * @index_buffer: Index buffer object name
- *
- * This struct holds the sink's EGL/GLES rendering context.
- */
-struct _GstEglGlesRenderContext
-{
-  EGLConfig config;
-  EGLContext eglcontext;
-  GstEGLDisplay *display, *set_display;
-  EGLNativeWindowType window, used_window;
-  EGLSurface surface;
-  gboolean buffer_preserved;
-  GLuint fragshader[3]; /* frame, border, frame-custom */
-  GLuint vertshader[3]; /* frame, border, frame-custom */
-  GLuint glslprogram[3]; /* frame, border, frame-custom */
-  GLuint texture[4]; /* RGB/Y, U/UV, V, custom */
-  EGLint surface_width;
-  EGLint surface_height;
-  EGLint pixel_aspect_ratio;
-  EGLint egl_minor, egl_major;
-  gint n_textures;
-
-  /* shader vars */
-  GLuint position_loc[3]; /* frame, border, frame-custom */
-  GLuint texpos_loc[2]; /* frame, frame-custom */
-  GLuint tex_scale_loc[1][3]; /* [frame] RGB/Y, U/UV, V */
-  GLuint tex_loc[2][3]; /* [frame,frame-custom] RGB/Y, U/UV, V */
-  coord5 position_array[16];    /* 4 x Frame x-normal,y-normal, 4x Frame x-normal,y-flip, 4 x Border1, 4 x Border2 */
-  unsigned short index_array[4];
-  unsigned int position_buffer, index_buffer;
-};
 
 /*
  * GstEglGlesSink:
@@ -155,9 +86,6 @@ struct _GstEglGlesRenderContext
  * @flow_lock: Simple concurrent access ward to the sink's runtime state
  * @have_window: Set if the sink has access to a window to hold it's canvas
  * @using_own_window: Set if the sink created its own window
- * @have_surface: Set if the EGL surface setup has been performed
- * @have_vbo: Set if the GLES VBO setup has been performed
- * @have_texture: Set if the GLES texture setup has been performed
  * @egl_started: Set if the whole EGL setup has been performed
  * @create_window: Property value holder to allow/forbid internal window creation
  * @force_rendering_slow: Property value holder to force slow rendering path
@@ -188,14 +116,12 @@ struct _GstEglGlesSink
   gboolean custom_format; /* If it's a single texture that is just copied */
   GstBufferPool *pool;
 
-  GstEglGlesRenderContext eglglesctx;
+  GstEglGlesRenderContext *eglglesctx;
+  GstEglAdaptationContext *egl_context;
 
   /* Runtime flags */
   gboolean have_window;
   gboolean using_own_window;
-  gboolean have_surface;;
-  gboolean have_vbo;
-  gboolean have_texture;
   gboolean egl_started;
 
   gpointer own_window_data;