eglglessink: Move eglgles Sink to ext/

ext/eglgles/Android.mk

@@ -0,0 +1,71 @@
+LOCAL_PATH := $(call my-dir)
+
+# -------------------------------------
+# gsteglglessink library
+#
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+gsteglglessink_FILES := gsteglglessink.c
+
+LOCAL_SRC_FILES := $(gsteglglessink_FILES)
+LOCAL_C_INCLUDES = $(LOCAL_PATH) \
+    $(LOCAL_PATH)/include
+
+ifneq ($(NDK_BUILD), true)
+LOCAL_C_INCLUDES += $(TOP)/frameworks/base
+else
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../android_headers
+endif
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += -Wall -Wdeclaration-after-statement -g -O2
+LOCAL_CFLAGS += -DANDROID_USE_GSTREAMER \
+    $(shell $(PKG_CONFIG) gstreamer-plugins-bad-0.10 --cflags) \
+    $(shell $(PKG_CONFIG) gstreamer-audio-0.10 --cflags)
+
+ifeq ($(USE_AUDIO_PURE_CODEC),true)
+LOCAL_CFLAGS += -DAUDIO_PURE_CODEC
+endif
+
+LOCAL_SHARED_LIBRARIES += libdl
+LOCAL_SHARED_LIBRARIES += \
+    libgstreamer-0.10     \
+    libgstbase-0.10       \
+    libglib-2.0           \
+    libgthread-2.0        \
+    libgmodule-2.0        \
+    libgobject-2.0        \
+    libgstvideo-0.10      \
+    libgstinterfaces-0.10
+
+ifneq ($(NDK_BUILD), true)
+LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib -llog
+else
+LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib -llog -lmedia -lutils
+endif
+
+LOCAL_LDFLAGS += -lEGL -lGLESv2
+
+LOCAL_SHARED_LIBRARIES += \
+    libutils              \
+    libcutils             \
+    libui                 \
+    libhardware           \
+    libandroid_runtime    \
+    libmedia
+
+
+LOCAL_MODULE:= libgsteglglessink
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
+
+#
+# define LOCAL_PRELINK_MODULE to false to not use pre-link map
+#
+LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE_TAGS := eng debug
+
+include $(BUILD_SHARED_LIBRARY)
+
+#endif  # USE_HARDWARE_MM == true

ext/eglgles/Makefile.am

@@ -0,0 +1,18 @@
+plugin_LTLIBRARIES = libgsteglglessink.la
+
+libgsteglglessink_la_SOURCES = gsteglglessink.c video_platform_wrapper.c
+
+libgsteglglessink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+                              $(GST_CFLAGS) \
+                              $(DROIDSINKS_CFLAGS) \
+                              $(X11_CFLAGS)
+
+libgsteglglessink_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) $(DROIDSINKS_LIBS) $(X11_LIBS) \
+	-lgstvideo-$(GST_MAJORMINOR) \
+	-lgstinterfaces-$(GST_MAJORMINOR)
+
+libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgsteglglessink_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = gsteglglessink.h video_platform_wrapper.h

ext/eglgles/gstvidroidsink.h

@@ -0,0 +1,167 @@
+/*
+ * GStreamer EGL/GLES Sink
+ * Copyright (C) 2012 Collabora Ltd.
+ *   @author: Reynaldo H. Verdejo Pinochet <reynaldo@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_EGLGLESSINK_H__
+#define __GST_EGLGLESSINK_H__
+
+#include <gst/gst.h>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+G_BEGIN_DECLS
+#define GST_TYPE_EGLGLESSINK \
+  (gst_eglglessink_get_type())
+#define GST_EGLGLESSINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_EGLGLESSINK,GstEglGlesSink))
+#define GST_EGLGLESSINK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_EGLGLESSINK,GstEglGlesSinkClass))
+#define GST_IS_EGLGLESSINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_EGLGLESSINK))
+#define GST_IS_EGLGLESSINK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_EGLGLESSINK))
+/* XXX: Harcoded format. Should be runtime built latter on. */
+#define GST_EGLGLESSINK_IMAGE_RGB565 1
+#define GST_EGLGLESSINK_IMAGE_NOFMT -1
+
+#define GST_EGLGLESSINK_EGL_MIN_VERSION 1 
+
+typedef struct _GstEglGlesBuffer GstEglGlesBuffer;
+typedef struct _GstEglGlesBufferClass GstEglGlesBufferClass;
+
+typedef struct _GstEglGlesSink GstEglGlesSink;
+typedef struct _GstEglGlesSinkClass GstEglGlesSinkClass;
+
+typedef struct _GstEglGlesImageFmt GstEglGlesImageFmt;
+
+/* Should be extended when new rendering methods
+ *   get implemented.
+ */
+typedef enum {
+    GST_EGLGLESSINK_RENDER_SLOW,
+    GST_EGLGLESSINK_RENDER_FAST
+} GstVidroidSinkRenderingPath;
+
+typedef struct _coord
+{
+  float x;
+  float y;
+  float z;
+} coord;
+
+struct _GstEglGlesImageFmt
+{
+  gint fmt;
+  GstCaps *caps;
+};
+
+/* XXX: Maybe use GstVideoRectangle for the image data? */
+struct _GstEglGlesBuffer
+{
+  GstBuffer buffer;
+  GstEglGlesSink *eglglessink;
+
+  EGLint *image;
+  gint format;
+
+  gint width, height;
+  size_t size;
+};
+
+struct _GstEglGlesSink
+{
+  GstVideoSink videosink;
+  GstVideoFormat format;
+  GstCaps *current_caps;
+  GstPad *sink;
+
+  /* XXX: The supported format list should likely be part
+   * of a local EGL/GLES context and built at runtime from
+   * the platform supported fmts. Right now we just add one
+   * format/caps at init.
+   */
+  GList *supported_fmts;
+
+  GMutex *flow_lock;
+
+  EGLConfig config;
+  EGLContext context;
+  EGLDisplay display;
+  EGLNativeWindowType window;
+  EGLSurface surface;
+
+  GLuint texture[1];
+
+  gboolean have_window;
+  gboolean have_surface;;
+  gboolean have_vbo;
+  gboolean have_texture;
+  gboolean running;
+
+  GstVidroidSinkRenderingPath rendering_path;
+
+  /* shader vars */
+  coord coordarray[4];
+  unsigned short indexarray[4];
+  unsigned int vdata, idata;
+
+  /* props */
+  gboolean silent;
+  gboolean can_create_window;
+  gboolean force_rendering_slow;
+  gint window_default_width;
+  gint window_default_height;
+};
+
+struct _GstEglGlesSinkClass
+{
+  GstVideoSinkClass parent_class;
+};
+
+GType gst_eglglessink_get_type (void);
+
+G_END_DECLS
+#endif /* __GST_EGLGLESSINK_H__ */

ext/eglgles/video_platform_wrapper.c

@@ -0,0 +1,142 @@
+/*
+ * GStreamer Android Video Platform Wrapper
+ * Copyright (C) 2012 Collabora Ltd.
+ *   @author: Reynaldo H. Verdejo Pinochet <reynaldo@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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#define EGL_EGLEXT_PROTOTYPES
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+
+#include <gst/gst.h>
+#include "video_platform_wrapper.h"
+
+#ifndef __BIONIC__
+#include <X11/Xlib.h>
+#endif
+
+GST_DEBUG_CATEGORY_STATIC (eglgles_platform_wrapper);
+#define GST_CAT_DEFAULT eglgles_platform_wrapper
+
+/* XXX: Likely to be removed */
+gboolean
+platform_wrapper_init (void)
+{
+  GST_DEBUG_CATEGORY_INIT (eglgles_platform_wrapper,
+      "EglGles Platform Wrapper", 0,
+      "Platform dependent native-window utility routines for EglGles");
+  return TRUE;
+}
+
+#ifndef __BIONIC__
+EGLNativeWindowType
+platform_create_native_window (gint width, gint height)
+{
+  Display *d;
+  Window w;
+  //XEvent e;
+  int s;
+
+  d = XOpenDisplay (NULL);
+  if (d == NULL) {
+    GST_CAT_ERROR (GST_CAT_DEFAULT, "Can't open X11 display");
+    return (EGLNativeWindowType) 0;
+  }
+
+  s = DefaultScreen (d);
+  w = XCreateSimpleWindow (d, RootWindow (d, s), 10, 10, width, height, 1,
+      BlackPixel (d, s), WhitePixel (d, s));
+  XStoreName (d, w, "eglglessink");
+  XMapWindow (d, w);
+  XFlush (d);
+  return (EGLNativeWindowType) w;
+}
+
+gboolean
+platform_destroy_native_window (EGLNativeDisplayType display,
+    EGLNativeWindowType window)
+{
+  /* XXX: Should proly catch BadWindow */
+  XDestroyWindow (display, window);
+  return TRUE;
+}
+
+/* XXX: Missing implementation */
+EGLint *
+platform_crate_native_image_buffer (EGLNativeWindowType win, EGLConfig config,
+    EGLNativeDisplayType display, const EGLint * egl_attribs)
+{
+  return NULL;
+}
+
+#else
+/* Android does not support the creation of an egl window surface
+ * from native code. Hence, we just return NULL here for the time
+ * being. Function is left for reference as implementing it should
+ * help us suport other EGL platforms.
+ */
+EGLNativeWindowType
+platform_create_native_window (gint width, gint height)
+{
+  /* XXX: There was one example on AOSP that was using something
+   * along the lines of window = android_createDisplaySurface();
+   * but wasn't working properly.
+   */
+
+  GST_CAT_ERROR (GST_CAT_DEFAULT, "Android: Can't create native window");
+  return (EGLNativeWindowType) 0;
+}
+
+gboolean
+platform_destroy_native_window (EGLNativeDisplayType display,
+    EGLNativeWindowType window)
+{
+  GST_CAT_ERROR (GST_CAT_DEFAULT, "Android: Can't destroy native window");
+  return TRUE;
+}
+
+#endif

ext/eglgles/video_platform_wrapper.h

@@ -0,0 +1,64 @@
+/*
+ * GStreamer Android Video Platform Wrapper 
+ * Copyright (C) 2012 Collabora Ltd.
+ *   @author: Reynaldo H. Verdejo Pinochet <reynaldo@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.
+ */
+
+/**
+ * General idea is to have all platform dependent code here for easy
+ * tweaking and isolation from the main routines
+ */
+
+#ifndef __GST_ANDROID_VIDEO_PLATFORM_WRAPPER__
+#define __GST_ANDROID_VIDEO_PLATFORM_WRAPPER__
+
+#include <gst/gst.h>
+#include <EGL/egl.h>
+
+gboolean platform_wrapper_init (void);
+EGLNativeWindowType platform_create_native_window (gint width, gint height);
+gboolean platform_destroy_native_window (EGLNativeDisplayType display,
+    EGLNativeWindowType w);
+EGLint *platform_crate_native_image_buffer (EGLNativeWindowType win,
+    EGLConfig config, EGLNativeDisplayType display, const EGLint * egl_attribs);
+
+
+#endif