diff options
| author | Thiago Santos <thiago.sousa.santos@collabora.com> | 2013-03-19 14:51:44 -0300 |
|---|---|---|
| committer | Thiago Santos <thiago.sousa.santos@collabora.com> | 2013-04-16 16:08:50 -0300 |
| commit | 14900cca9df6fa19a81b5b8aaf588070d5b8b303 (patch) | |
| tree | 4e799014fe2984558d88fc143d53bd4c78b8fc4e | |
| parent | 25e8cd0034f551f528a195d75eb9377804ab40e6 (diff) | |
| download | gstreamer-plugins-bad-14900cca9df6fa19a81b5b8aaf588070d5b8b303.tar.gz | |
eglglessink: remove more egl specific code
Remove platform wrapper code that should only be used for EGL, and
not for EAGL
| -rw-r--r-- | ext/eglgles/Makefile.am | 4 | ||||
| -rw-r--r-- | ext/eglgles/gstegladaptation_egl.c | 4 | ||||
| -rw-r--r-- | ext/eglgles/gsteglglessink.c | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/ext/eglgles/Makefile.am b/ext/eglgles/Makefile.am index a5f2eab68..df44a0695 100644 --- a/ext/eglgles/Makefile.am +++ b/ext/eglgles/Makefile.am @@ -3,10 +3,10 @@ plugin_LTLIBRARIES = libgsteglglessink.la if HAVE_IOS DISTRO_SRC = gstegladaptation_eagl.m else -DISTRO_SRC = gstegladaptation_egl.c +DISTRO_SRC = gstegladaptation_egl.c video_platform_wrapper.c endif -libgsteglglessink_la_SOURCES = gsteglglessink.c video_platform_wrapper.c gstegladaptation.c $(DISTRO_SRC) +libgsteglglessink_la_SOURCES = gsteglglessink.c gstegladaptation.c $(DISTRO_SRC) libgsteglglessink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ diff --git a/ext/eglgles/gstegladaptation_egl.c b/ext/eglgles/gstegladaptation_egl.c index 4abfc9d26..b1367c423 100644 --- a/ext/eglgles/gstegladaptation_egl.c +++ b/ext/eglgles/gstegladaptation_egl.c @@ -114,6 +114,10 @@ gst_egl_adaptation_init_display (GstEglAdaptationContext * ctx) EGLDisplay display; GST_DEBUG_OBJECT (ctx->element, "Enter EGL initial configuration"); + if (!platform_wrapper_init ()) { + GST_ERROR_OBJECT (ctx->element, "Couldn't init EGL platform wrapper"); + goto HANDLE_ERROR; + } #ifdef USE_EGL_RPI /* See https://github.com/raspberrypi/firmware/issues/99 */ if (!eglMakeCurrent ((EGLDisplay) 1, EGL_NO_SURFACE, EGL_NO_SURFACE, diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c index b657c5d91..130bf83fc 100644 --- a/ext/eglgles/gsteglglessink.c +++ b/ext/eglgles/gsteglglessink.c @@ -202,11 +202,6 @@ GST_BOILERPLATE_FULL (GstEglGlesSink, gst_eglglessink, GstVideoSink, static inline gboolean egl_init (GstEglGlesSink * eglglessink) { - if (!platform_wrapper_init ()) { - GST_ERROR_OBJECT (eglglessink, "Couldn't init EGL platform wrapper"); - goto HANDLE_ERROR; - } - if (!gst_egl_adaptation_init_display (eglglessink->egl_context)) { GST_ERROR_OBJECT (eglglessink, "Couldn't init EGL display"); goto HANDLE_ERROR; |