* [PATCH v2 1/2] gstreamer1.0-plugins-bad: Support fb backend for gl plugins
2016-11-01 6:09 [PATCH v2 0/2] Add patches for gstreamer1.0-plugins-bad V1.8.3 Yuqing Zhu
@ 2016-11-01 6:09 ` Yuqing Zhu
2016-11-01 6:09 ` [PATCH v2 2/2] gstreamer1.0-plugins-bad: Fix build issue on non-GPU SoC Yuqing Zhu
1 sibling, 0 replies; 3+ messages in thread
From: Yuqing Zhu @ 2016-11-01 6:09 UTC (permalink / raw)
To: meta-freescale; +Cc: Yuqing Zhu
1. Add fb support in glimagesink
2. Override set_render_rectangle() to support resize
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
---
.../0002-Support-fb-backend-for-gl-plugins.patch | 758 +++++++++++++++++++++
...v-to-glimagesink-to-improve-playback-per.patch} | 0
...glplugin-Accelerate-gldownload-with-dire.patch} | 0
...Fix-dependence-issue-between-gst-plugin-.patch} | 0
...convert-convert-YUV-to-RGB-use-directviv.patch} | 0
...k-around-for-no-frame-when-imxplayer-use.patch} | 0
...olorconvert-fix-MRT-cannot-work-in-GLES3.patch} | 0
.../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 13 +-
8 files changed, 765 insertions(+), 6 deletions(-)
create mode 100755 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-Support-fb-backend-for-gl-plugins.patch
rename recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{0002-Add-directviv-to-glimagesink-to-improve-playback-per.patch => 0003-Add-directviv-to-glimagesink-to-improve-playback-per.patch} (100%)
rename recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{0003-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch => 0004-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch} (100%)
rename recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{0004-Fix-dependence-issue-between-gst-plugin-.patch => 0005-Fix-dependence-issue-between-gst-plugin-.patch} (100%)
rename recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{0005-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch => 0006-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch} (100%)
rename recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{0006-glwindow-work-around-for-no-frame-when-imxplayer-use.patch => 0007-glwindow-work-around-for-no-frame-when-imxplayer-use.patch} (100%)
rename recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/{0007-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch => 0008-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch} (100%)
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-Support-fb-backend-for-gl-plugins.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-Support-fb-backend-for-gl-plugins.patch
new file mode 100755
index 0000000..b5b8d64
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-Support-fb-backend-for-gl-plugins.patch
@@ -0,0 +1,758 @@
+From 230873df6cfd43ce70d9dc763d6f47415f846059 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <b55597@freescale.com>
+Date: Mon, 16 Nov 2015 17:41:57 +0800
+Subject: [PATCH] Support fb backend for gl plugins
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+1.Add fb support in glimagesink
+2.override set_render_rectangle() to support resize
+
+Upstream-Status: Inappropriate [i.MX specific]
+
+Signed-off-by: Haihua Hu <b55597@freescale.com>
+---
+ configure.ac | 25 ++-
+ gst-libs/gst/gl/Makefile.am | 5 +
+ gst-libs/gst/gl/fb/Makefile.am | 25 +++
+ gst-libs/gst/gl/fb/gstgldisplay_fb.c | 109 +++++++++++++
+ gst-libs/gst/gl/fb/gstgldisplay_fb.h | 67 ++++++++
+ gst-libs/gst/gl/fb/gstglwindow_fb_egl.c | 265 ++++++++++++++++++++++++++++++++
+ gst-libs/gst/gl/fb/gstglwindow_fb_egl.h | 65 ++++++++
+ gst-libs/gst/gl/gstgldisplay.c | 8 +
+ gst-libs/gst/gl/gstgldisplay.h | 1 +
+ gst-libs/gst/gl/gstglwindow.c | 5 +
+ 10 files changed, 574 insertions(+), 1 deletion(-)
+ create mode 100644 gst-libs/gst/gl/fb/Makefile.am
+ create mode 100644 gst-libs/gst/gl/fb/gstgldisplay_fb.c
+ create mode 100644 gst-libs/gst/gl/fb/gstgldisplay_fb.h
+ create mode 100644 gst-libs/gst/gl/fb/gstglwindow_fb_egl.c
+ create mode 100644 gst-libs/gst/gl/fb/gstglwindow_fb_egl.h
+
+diff --git a/configure.ac b/configure.ac
+index 8d82850..537ee33 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -682,6 +682,7 @@ save_LIBS="$LIBS"
+ HAVE_GL=no
+ HAVE_GLES2=no
+ HAVE_WAYLAND_EGL=no
++HAV_FB_EGL=no
+
+ HAVE_EGL_RPI=no
+
+@@ -718,6 +719,9 @@ case $host in
+ old_LIBS=$LIBS
+ old_CFLAGS=$CFLAGS
+
++ dnl check for imx fbbackend support
++ AC_CHECK_LIB(EGL, fbGetDisplay, HAVE_FB_EGL=yes, HAVE_FB_EGL=no)
++
+ dnl FIXME: Mali EGL depends on GLESv1 or GLESv2
+ AC_CHECK_HEADER([EGL/fbdev_window.h],
+ [
+@@ -1003,6 +1007,16 @@ case $host in
+ fi
+ fi
+
++ if test "x$HAVE_FB_EGL" = "xyes"; then
++ if test "x$NEED_EGL" = "xno" -o "x$HAVE_EGL" = "xno"; then
++ AC_MSG_WARN([EGL is required by the fb backend for OpenGL support])
++ else
++ HAVE_WINDOW_FB=yes
++ GL_LIBS="$GL_LIBS"
++ GL_CFLAGS="$GL_CFLAGS"
++ fi
++ fi
++
+ if test "x$HAVE_EGL_RPI" = "xyes"; then
+ if test "x$NEED_DISPMANX" != "xno"; then
+ HAVE_WINDOW_DISPMANX=yes
+@@ -1017,7 +1031,7 @@ case $host in
+ fi
+ else
+ if test "x$NEED_EGL" != "xno"; then
+- if test "x$HAVE_WINDOW_WAYLAND" = "xyes" -o "x$HAVE_WINDOW_X11" = "xyes" -o "x$HAVE_WINDOW_DISPMANX" = "xyes"; then
++ if test "x$HAVE_WINDOW_WAYLAND" = "xyes" -o "x$HAVE_WINDOW_X11" = "xyes" -o "x$HAVE_WINDOW_DISPMANX" = "xyes" -o "x$HAVE_WINDOW_FB" = "xyes"; then
+ GL_LIBS="$GL_LIBS -lEGL $EGL_LIBS"
+ GL_CFLAGS="$GL_CFLAGS $EGL_CFLAGS"
+ USE_EGL=yes
+@@ -1166,6 +1180,7 @@ GST_GL_HAVE_WINDOW_WAYLAND=0
+ GST_GL_HAVE_WINDOW_ANDROID=0
+ GST_GL_HAVE_WINDOW_DISPMANX=0
+ GST_GL_HAVE_WINDOW_EAGL=0
++GST_GL_HAVE_WINDOW_FB=0
+
+ if test "x$HAVE_WINDOW_X11" = "xyes"; then
+ GL_WINDOWS="x11 $GL_WINDOWS"
+@@ -1195,6 +1210,10 @@ if test "x$HAVE_WINDOW_EAGL" = "xyes"; then
+ GL_WINDOWS="eagl $GL_WINDOWS"
+ GST_GL_HAVE_WINDOW_EAGL=1
+ fi
++if test "x$HAVE_WINDOW_FB" = "xyes"; then
++ GL_WINDOWS="fb $GL_WINDOWS"
++ GST_GL_HAVE_WINDOW_FB=1
++fi
+
+ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
+ #define GST_GL_HAVE_WINDOW_X11 $GST_GL_HAVE_WINDOW_X11
+@@ -1204,6 +1223,7 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
+ #define GST_GL_HAVE_WINDOW_ANDROID $GST_GL_HAVE_WINDOW_ANDROID
+ #define GST_GL_HAVE_WINDOW_DISPMANX $GST_GL_HAVE_WINDOW_DISPMANX
+ #define GST_GL_HAVE_WINDOW_EAGL $GST_GL_HAVE_WINDOW_EAGL
++#define GST_GL_HAVE_WINDOW_FB $GST_GL_HAVE_WINDOW_FB
+ "
+
+ dnl PLATFORM's
+@@ -1279,6 +1299,7 @@ if test "x$GL_APIS" = "x" -o "x$GL_PLATFORMS" = "x" -o "x$GL_WINDOWS" = "x"; the
+ HAVE_WINDOW_ANDROID=no
+ HAVE_WINDOW_COCOA=no
+ HAVE_WINDOW_EAGL=no
++ HAVE_WINDOW_FB=no
+ fi
+
+ AC_SUBST(GL_LIBS)
+@@ -1294,6 +1315,7 @@ AM_CONDITIONAL(HAVE_WINDOW_DISPMANX, test "x$HAVE_WINDOW_DISPMANX" = "xyes")
+ AM_CONDITIONAL(HAVE_WINDOW_WAYLAND, test "x$HAVE_WINDOW_WAYLAND" = "xyes")
+ AM_CONDITIONAL(HAVE_WINDOW_ANDROID, test "x$HAVE_WINDOW_ANDROID" = "xyes")
+ AM_CONDITIONAL(HAVE_WINDOW_EAGL, test "x$HAVE_WINDOW_EAGL" = "xyes")
++AM_CONDITIONAL(HAVE_WINDOW_FB, test "x$HAVE_WINDOW_FB" = "xyes")
+
+ AM_CONDITIONAL(USE_OPENGL, test "x$USE_OPENGL" = "xyes")
+ AM_CONDITIONAL(USE_GLES2, test "x$USE_GLES2" = "xyes")
+@@ -3580,6 +3602,7 @@ gst-libs/gst/gl/egl/Makefile
+ gst-libs/gst/gl/wayland/Makefile
+ gst-libs/gst/gl/win32/Makefile
+ gst-libs/gst/gl/x11/Makefile
++gst-libs/gst/gl/fb/Makefile
+ gst-libs/gst/insertbin/Makefile
+ gst-libs/gst/interfaces/Makefile
+ gst-libs/gst/codecparsers/Makefile
+diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
+index f1cb9e1..4bd6511 100644
+--- a/gst-libs/gst/gl/Makefile.am
++++ b/gst-libs/gst/gl/Makefile.am
+@@ -117,6 +117,11 @@ SUBDIRS += eagl
+ libgstgl_@GST_API_VERSION@_la_LIBADD += eagl/libgstgl-eagl.la
+ endif
+
++if HAVE_WINDOW_FB
++SUBDIRS += fb
++libgstgl_@GST_API_VERSION@_la_LIBADD += fb/libgstgl-fb.la
++endif
++
+ if USE_EGL
+ SUBDIRS += egl
+ libgstgl_@GST_API_VERSION@_la_LIBADD += egl/libgstgl-egl.la
+diff --git a/gst-libs/gst/gl/fb/Makefile.am b/gst-libs/gst/gl/fb/Makefile.am
+new file mode 100644
+index 0000000..8e4656c
+--- /dev/null
++++ b/gst-libs/gst/gl/fb/Makefile.am
+@@ -0,0 +1,25 @@
++## Process this file with automake to produce Makefile.in
++
++noinst_LTLIBRARIES = libgstgl-fb.la
++
++libgstgl_fb_la_SOURCES = \
++ gstgldisplay_fb.c \
++ gstglwindow_fb_egl.c
++
++noinst_HEADERS = \
++ gstgldisplay_fb.h \
++ gstglwindow_fb_egl.h
++
++libgstgl_fbincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl/fb
++
++libgstgl_fb_la_CFLAGS = \
++ -I$(top_srcdir)/gst-libs \
++ -I$(top_builddir)/gst-libs \
++ $(GL_CFLAGS) \
++ $(GST_PLUGINS_BASE_CFLAGS) \
++ $(GST_BASE_CFLAGS) \
++ $(GST_CFLAGS)
++
++libgstgl_fb_la_LDFLAGS = \
++ $(GST_LIB_LDFLAGS) \
++ $(GST_ALL_LDFLAGS)
+diff --git a/gst-libs/gst/gl/fb/gstgldisplay_fb.c b/gst-libs/gst/gl/fb/gstgldisplay_fb.c
+new file mode 100644
+index 0000000..3be9756
+--- /dev/null
++++ b/gst-libs/gst/gl/fb/gstgldisplay_fb.c
+@@ -0,0 +1,109 @@
++/*
++ * GStreamer
++ * Copyright (C) 2014 Matthew Waters <ystreet00@gmail.com>
++ *
++ * 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., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <gst/gl/fb/gstgldisplay_fb.h>
++
++GST_DEBUG_CATEGORY_STATIC (gst_gl_display_debug);
++#define GST_CAT_DEFAULT gst_gl_display_debug
++
++G_DEFINE_TYPE (GstGLDisplayFB, gst_gl_display_fb, GST_TYPE_GL_DISPLAY);
++
++static void gst_gl_display_fb_finalize (GObject * object);
++static guintptr gst_gl_display_fb_get_handle (GstGLDisplay * display);
++
++static void
++gst_gl_display_fb_class_init (GstGLDisplayFBClass * klass)
++{
++ GST_GL_DISPLAY_CLASS (klass)->get_handle =
++ GST_DEBUG_FUNCPTR (gst_gl_display_fb_get_handle);
++
++ G_OBJECT_CLASS (klass)->finalize = gst_gl_display_fb_finalize;
++}
++
++static void
++gst_gl_display_fb_init (GstGLDisplayFB * display_fb)
++{
++ GstGLDisplay *display = (GstGLDisplay *) display_fb;
++
++ display->type = GST_GL_DISPLAY_TYPE_FB;
++ display_fb->name = NULL;
++ display_fb->disp_idx = 0;
++ display_fb->display = NULL;
++}
++
++static void
++gst_gl_display_fb_finalize (GObject * object)
++{
++ GstGLDisplayFB *display_fb = GST_GL_DISPLAY_FB (object);
++
++ if (display_fb->name)
++ g_free (display_fb->name);
++
++ if (display_fb->display)
++ fbDestroyDisplay (display_fb->display);
++
++ G_OBJECT_CLASS (gst_gl_display_fb_parent_class)->finalize (object);
++}
++
++/**
++ * gst_gl_display_fb_new:
++ * @name: (allow-none): a display name
++ *
++ * Create a new #GstGLDisplayFB from the x11 display name. See XOpenDisplay()
++ * for details on what is a valid name.
++ *
++ * Returns: (transfer full): a new #GstGLDisplayFB or %NULL
++ */
++GstGLDisplayFB *
++gst_gl_display_fb_new (gchar *name)
++{
++ GstGLDisplayFB *display;
++ const gchar *fb_name = NULL;
++
++ GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay");
++ GST_DEBUG ("creating Fb EGL display");
++
++ fb_name = name;
++ if (!fb_name) fb_name = "fb0";
++
++ display = g_object_new (GST_TYPE_GL_DISPLAY_FB, NULL);
++ display->name = g_strdup (fb_name);
++ sscanf (display->name, "fb%d", &display->disp_idx);
++ display->display = fbGetDisplayByIndex (display->disp_idx);
++ if (!display->display) {
++ GST_ERROR ("Failed to open FB display, \'%s\'", fb_name);
++ return NULL;
++ }
++
++ GST_DEBUG ("Created fb EGL display %d", display->display);
++
++ return display;
++}
++
++static guintptr
++gst_gl_display_fb_get_handle (GstGLDisplay * display)
++{
++ GST_DEBUG ("Get fb EGL display %d", GST_GL_DISPLAY_FB (display)->display);
++ return (guintptr) GST_GL_DISPLAY_FB (display)->display;
++}
+diff --git a/gst-libs/gst/gl/fb/gstgldisplay_fb.h b/gst-libs/gst/gl/fb/gstgldisplay_fb.h
+new file mode 100644
+index 0000000..62987c1
+--- /dev/null
++++ b/gst-libs/gst/gl/fb/gstgldisplay_fb.h
+@@ -0,0 +1,67 @@
++/*
++ * GStreamer
++ * Copyright (C) 2014 Matthew Waters <ystreet00@gmail.com>
++ *
++ * 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., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#ifndef __GST_GL_DISPLAY_FB_H__
++#define __GST_GL_DISPLAY_FB_H__
++
++#include <EGL/egl.h>
++#include <gst/gst.h>
++#include <gst/gl/gstgldisplay.h>
++
++G_BEGIN_DECLS
++
++GType gst_gl_display_fb_get_type (void);
++
++#define GST_TYPE_GL_DISPLAY_FB (gst_gl_display_fb_get_type())
++#define GST_GL_DISPLAY_FB(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GL_DISPLAY_FB,GstGLDisplayFB))
++#define GST_GL_DISPLAY_FB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_GL_DISPLAY_FB,GstGLDisplayFBClass))
++#define GST_IS_GL_DISPLAY_FB(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GL_DISPLAY_FB))
++#define GST_IS_GL_DISPLAY_FB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_GL_DISPLAY_FB))
++#define GST_GL_DISPLAY_FB_CAST(obj) ((GstGLDisplayFB*)(obj))
++
++typedef struct _GstGLDisplayFB GstGLDisplayFB;
++typedef struct _GstGLDisplayFBClass GstGLDisplayFBClass;
++
++/**
++ * GstGLDisplayFB:
++ *
++ * the contents of a #GstGLDisplayFB are private and should only be accessed
++ * through the provided API
++ */
++struct _GstGLDisplayFB
++{
++ GstGLDisplay parent;
++
++ /* <private> */
++ gchar *name;
++ gint disp_idx;
++ EGLNativeDisplayType display;
++};
++
++struct _GstGLDisplayFBClass
++{
++ GstGLDisplayClass object_class;
++};
++
++GstGLDisplayFB *gst_gl_display_fb_new (gchar *name);
++
++G_END_DECLS
++
++#endif /* __GST_GL_DISPLAY_FB_H__ */
+diff --git a/gst-libs/gst/gl/fb/gstglwindow_fb_egl.c b/gst-libs/gst/gl/fb/gstglwindow_fb_egl.c
+new file mode 100644
+index 0000000..a068e30
+--- /dev/null
++++ b/gst-libs/gst/gl/fb/gstglwindow_fb_egl.c
+@@ -0,0 +1,265 @@
++/*
++ * GStreamer
++ * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com>
++ * Copyright (C) 2012 Matthew Waters <ystreet00@gmail.com>
++ *
++ * 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., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#include "../gstgl_fwd.h"
++#include <gst/gl/gstglcontext.h>
++
++#include "gstglwindow_fb_egl.h"
++
++#define GST_CAT_DEFAULT gst_gl_window_debug
++
++#define gst_gl_window_fb_egl_parent_class parent_class
++G_DEFINE_TYPE (GstGLWindowFbEGL, gst_gl_window_fb_egl,
++ GST_GL_TYPE_WINDOW);
++
++static guintptr gst_gl_window_fb_egl_get_window_handle (GstGLWindow *
++ window);
++static void gst_gl_window_fb_egl_set_window_handle (GstGLWindow * window,
++ guintptr handle);
++static void gst_gl_window_fb_egl_draw (GstGLWindow * window);
++static void gst_gl_window_fb_egl_close (GstGLWindow * window);
++static gboolean gst_gl_window_fb_egl_open (GstGLWindow * window,
++ GError ** error);
++static gboolean
++gst_gl_window_fb_egl_set_render_rectangle(GstGLWindow * window,
++ guint x, guint y, guint width, guint height);
++
++static void
++gst_gl_window_fb_egl_class_init (GstGLWindowFbEGLClass * klass)
++{
++ GstGLWindowClass *window_class = (GstGLWindowClass *) klass;
++
++ window_class->get_window_handle =
++ GST_DEBUG_FUNCPTR (gst_gl_window_fb_egl_get_window_handle);
++ window_class->set_window_handle =
++ GST_DEBUG_FUNCPTR (gst_gl_window_fb_egl_set_window_handle);
++ window_class->draw = GST_DEBUG_FUNCPTR (gst_gl_window_fb_egl_draw);
++ window_class->close = GST_DEBUG_FUNCPTR (gst_gl_window_fb_egl_close);
++ window_class->open = GST_DEBUG_FUNCPTR (gst_gl_window_fb_egl_open);
++ window_class->set_render_rectangle =
++ GST_DEBUG_FUNCPTR (gst_gl_window_fb_egl_set_render_rectangle);
++}
++
++static void
++gst_gl_window_fb_egl_init (GstGLWindowFbEGL * window)
++{
++ GstGLWindowFbEGL *window_egl;
++
++ window_egl = GST_GL_WINDOW_FB_EGL (window);
++
++ window_egl->width = 0;
++ window_egl->height = 0;
++ window_egl->default_fullscreen = TRUE;
++ window_egl->display = 0;
++}
++
++/* Must be called in the gl thread */
++GstGLWindowFbEGL *
++gst_gl_window_fb_egl_new (GstGLDisplay * display)
++{
++ GstGLWindowFbEGL *window;
++ const gchar *fb_name = NULL;
++
++ if (!display)
++ return NULL;
++
++ window = g_object_new (GST_GL_TYPE_WINDOW_FB_EGL, NULL);
++ window->display = gst_gl_display_get_handle (display);
++ if (!window->display) {
++ GST_ERROR ("failed to get display for egl window");
++ return NULL;
++ }
++
++ return window;
++}
++
++static void
++gst_gl_window_fb_egl_close (GstGLWindow * window)
++{
++ GstGLWindowFbEGL *window_egl;
++
++ window_egl = GST_GL_WINDOW_FB_EGL (window);
++
++ if (window_egl->win_id) {
++ fbDestroyWindow (window_egl->win_id);
++ }
++
++ GST_GL_WINDOW_CLASS (parent_class)->close (window);
++}
++
++static gboolean
++gst_gl_window_fb_egl_open (GstGLWindow * window, GError ** error)
++{
++ GstGLWindowFbEGL *window_egl;
++
++ window_egl = GST_GL_WINDOW_FB_EGL (window);
++
++ if (!window_egl->display) {
++ GST_ERROR ("No display for window_egl.");
++ return FALSE;
++ }
++
++ window_egl->win_id = fbCreateWindow (window_egl->display, -1, -1, 0, 0);
++ if (!window_egl->win_id) {
++ GST_ERROR ("Failed to create window_egl");
++ return FALSE;
++ }
++
++ fbGetDisplayGeometry (window_egl->display, &window_egl->width, &window_egl->height);
++ window_egl->req_width = window_egl->width;
++ window_egl->req_height = window_egl->height;
++ GST_DEBUG ("Open FB display succesfully, resolution is (%dx%d),display %d, window %d.",
++ window_egl->width, window_egl->height, window_egl->display, window_egl->win_id);
++
++ if (!GST_GL_WINDOW_CLASS (parent_class)->open (window, error))
++ return FALSE;
++
++ return TRUE;
++}
++static guintptr
++gst_gl_window_fb_egl_get_window_handle (GstGLWindow * window)
++{
++ GST_DEBUG ("fb egl get window: %d", GST_GL_WINDOW_FB_EGL (window)->win_id);
++ return (guintptr) GST_GL_WINDOW_FB_EGL (window)->win_id;
++}
++
++static void
++gst_gl_window_fb_egl_set_window_handle (GstGLWindow * window,
++ guintptr handle)
++{
++}
++
++static void
++draw_cb (gpointer data)
++{
++ GstGLWindowFbEGL *window_egl = (GstGLWindowFbEGL *)data;
++ GstGLWindow *window = GST_GL_WINDOW (window_egl);
++ GstGLContext *context = gst_gl_window_get_context (window);
++ GstGLContextClass *context_class = GST_GL_CONTEXT_GET_CLASS (context);
++
++ /* default full screen */
++ if (window_egl->default_fullscreen && window->resize) {
++ window->resize (window->resize_data, window_egl->width, window_egl->height);
++ window_egl->default_fullscreen = FALSE;
++ }
++
++ if (window->draw)
++ window->draw (window->draw_data);
++
++ GST_DEBUG ("####### draw data");
++ context_class->swap_buffers (context);
++
++ gst_object_unref (context);
++}
++
++static void
++gst_gl_window_fb_egl_draw (GstGLWindow * window)
++{
++ gst_gl_window_send_message (window, (GstGLWindowCB) draw_cb, window);
++}
++
++static gboolean
++_calculate_viewport_coordinates(GstVideoRectangle *req, GstVideoRectangle *result,
++ guint display_width, guint display_height)
++{
++ if(!req || !result || req->w < 1 || req->h < 1)
++ return FALSE;
++
++ result->x = req->x;
++ result->y = display_height - (req->y + req->h);
++ result->w = req->w;
++ result->h = req->h;
++
++ return TRUE;
++}
++
++struct SetRenderRectangle
++{
++ GstGLWindowFbEGL *window_egl;
++ GstVideoRectangle rect;
++};
++
++static void
++_free_set_render_rectangle (struct SetRenderRectangle *render)
++{
++ if (render) {
++ if (render->window_egl)
++ gst_object_unref (render->window_egl);
++ g_free (render);
++ }
++}
++
++static void
++_set_render_rectangle (gpointer data)
++{
++ const GstGLFuncs *gl;
++ GstGLContext *context;
++ GstVideoRectangle result, video_rect, tmp_res;
++ struct SetRenderRectangle *render = data;
++ GstGLWindow *window = GST_GL_WINDOW (render->window_egl);
++
++ context = gst_gl_window_get_context(window);
++ gl = context->gl_vtable;
++
++ GST_LOG_OBJECT (render->window_egl, "setting render rectangle %i,%i+%ix%i",
++ render->rect.x, render->rect.y, render->rect.w, render->rect.h);
++
++ video_rect.x = render->rect.x;
++ video_rect.y = render->rect.y;
++ video_rect.w = GST_VIDEO_SINK_WIDTH(window->resize_data);
++ video_rect.h = GST_VIDEO_SINK_HEIGHT(window->resize_data);
++
++ gst_video_sink_center_rect(video_rect, render->rect, &tmp_res, TRUE);
++
++ GST_LOG_OBJECT (render->window_egl, "set center render rectangle %i,%i+%ix%i",
++ tmp_res.x, tmp_res.y, tmp_res.w, tmp_res.h);
++
++ /* need to transform screen coordinate to viewport coordinate */
++ if( _calculate_viewport_coordinates(&tmp_res, &result,
++ render->window_egl->width, render->window_egl->height)){
++ GST_LOG_OBJECT (render->window_egl, "viewport render rectangle %i,%i+%ix%i",
++ result.x, result.y, result.w, result.h);
++ gl->Viewport(result.x, result.y, result.w, result.h);
++ }
++
++ if(context)
++ gst_object_unref(context);
++}
++
++static gboolean
++gst_gl_window_fb_egl_set_render_rectangle(GstGLWindow * window,
++ guint x, guint y, guint width, guint height)
++{
++ GstGLWindowFbEGL *window_egl = GST_GL_WINDOW_FB_EGL (window);
++ struct SetRenderRectangle *render;
++
++ render = g_new0 (struct SetRenderRectangle, 1);
++ render->window_egl = gst_object_ref (window_egl);
++ render->rect.x = x;
++ render->rect.y = y;
++ render->rect.w = width;
++ render->rect.h = height;
++
++ gst_gl_window_send_message_async (window,
++ (GstGLWindowCB) _set_render_rectangle, render,
++ (GDestroyNotify) _free_set_render_rectangle);
++ return TRUE;
++}
+diff --git a/gst-libs/gst/gl/fb/gstglwindow_fb_egl.h b/gst-libs/gst/gl/fb/gstglwindow_fb_egl.h
+new file mode 100644
+index 0000000..216e421
+--- /dev/null
++++ b/gst-libs/gst/gl/fb/gstglwindow_fb_egl.h
+@@ -0,0 +1,65 @@
++/*
++ * GStreamer
++ * Copyright (C) 2012 Matthew Waters <ystreet00@gmail.com>
++ *
++ * 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., 51 Franklin St, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
++#ifndef __GST_GL_WINDOW_FB_EGL_H__
++#define __GST_GL_WINDOW_FB_EGL_H__
++
++#include <gst/gl/gl.h>
++#include "EGL/eglplatform.h"
++
++G_BEGIN_DECLS
++
++#define GST_GL_TYPE_WINDOW_FB_EGL (gst_gl_window_fb_egl_get_type())
++#define GST_GL_WINDOW_FB_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_FB_EGL, GstGLWindowFbEGL))
++#define GST_GL_WINDOW_FB_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_FB_EGL, GstGLWindowFbEGLClass))
++#define GST_GL_IS_WINDOW_FB_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_FB_EGL))
++#define GST_GL_IS_WINDOW_FB_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_FB_EGL))
++#define GST_GL_WINDOW_FB_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_FB_EGL, GstGLWindowFbEGL_Class))
++
++typedef struct _GstGLWindowFbEGL GstGLWindowFbEGL;
++typedef struct _GstGLWindowFbEGLClass GstGLWindowFbEGLClass;
++
++struct _GstGLWindowFbEGL {
++ /*< private >*/
++ GstGLWindow parent;
++
++ /* <private> */
++ gint width, req_width;
++ gint height, req_height;
++ gboolean default_fullscreen;
++ EGLNativeDisplayType display;
++ EGLNativeWindowType win_id;
++};
++
++struct _GstGLWindowFbEGLClass {
++ /*< private >*/
++ GstGLWindowClass parent_class;
++
++ /*< private >*/
++ gpointer _reserved[GST_PADDING];
++};
++
++GType gst_gl_window_fb_egl_get_type (void);
++
++GstGLWindowFbEGL * gst_gl_window_fb_egl_new (GstGLDisplay * display);
++
++G_END_DECLS
++
++#endif /* __GST_GL_WINDOW_FB_EGL_H__ */
+diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
+index 5cae2f4..0213d60 100644
+--- a/gst-libs/gst/gl/gstgldisplay.c
++++ b/gst-libs/gst/gl/gstgldisplay.c
+@@ -205,6 +205,14 @@ gst_gl_display_new (void)
+ if (!display && (!user_choice || g_strstr_len (user_choice, 7, "wayland")))
+ display = GST_GL_DISPLAY (gst_gl_display_wayland_new (NULL));
+ #endif
++#if GST_GL_HAVE_WINDOW_FB
++ if (!display && (!user_choice || g_strstr_len (user_choice, 2, "fb"))) {
++ const gchar *fb_name = NULL;
++ fb_name = g_getenv ("GST_GL_FB");
++ if (!fb_name) fb_name = "fb0";
++ display = GST_GL_DISPLAY (gst_gl_display_fb_new (fb_name));
++ }
++#endif
+ #if GST_GL_HAVE_PLATFORM_EGL
+ if (!display && (!platform_choice
+ || g_strstr_len (platform_choice, 3, "egl")))
+diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h
+index 7f49a44..c5bc985 100644
+--- a/gst-libs/gst/gl/gstgldisplay.h
++++ b/gst-libs/gst/gl/gstgldisplay.h
+@@ -60,6 +60,7 @@ typedef enum
+ GST_GL_DISPLAY_TYPE_WIN32 = (1 << 3),
+ GST_GL_DISPLAY_TYPE_DISPMANX = (1 << 4),
+ GST_GL_DISPLAY_TYPE_EGL = (1 << 5),
++ GST_GL_DISPLAY_TYPE_FB = (1 << 6),
+
+ GST_GL_DISPLAY_TYPE_ANY = G_MAXUINT32
+ } GstGLDisplayType;
+diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c
+index 695f4c4..7b20ff4 100644
+--- a/gst-libs/gst/gl/gstglwindow.c
++++ b/gst-libs/gst/gl/gstglwindow.c
+@@ -302,6 +302,11 @@ gst_gl_window_new (GstGLDisplay * display)
+ if (!window && (!user_choice || g_strstr_len (user_choice, 4, "eagl")))
+ window = GST_GL_WINDOW (gst_gl_window_eagl_new (display));
+ #endif
++#if GST_GL_HAVE_WINDOW_FB
++ if (!window && (!user_choice || g_strstr_len (user_choice, 2, "fb")))
++ window = GST_GL_WINDOW (gst_gl_window_fb_egl_new (display));
++#endif
++
+ if (!window) {
+ /* subclass returned a NULL window */
+ GST_WARNING ("Could not create window. user specified %s, creating dummy"
+--
+1.9.1
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-Add-directviv-to-glimagesink-to-improve-playback-per.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-Add-directviv-to-glimagesink-to-improve-playback-per.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-Add-directviv-to-glimagesink-to-improve-playback-per.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-Add-directviv-to-glimagesink-to-improve-playback-per.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-Fix-dependence-issue-between-gst-plugin-.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-Fix-dependence-issue-between-gst-plugin-.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-Fix-dependence-issue-between-gst-plugin-.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-Fix-dependence-issue-between-gst-plugin-.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0006-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0006-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0006-glwindow-work-around-for-no-frame-when-imxplayer-use.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glwindow-work-around-for-no-frame-when-imxplayer-use.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0006-glwindow-work-around-for-no-frame-when-imxplayer-use.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glwindow-work-around-for-no-frame-when-imxplayer-use.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0008-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch
similarity index 100%
rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch
rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0008-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index c663d94..9ee82a8 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -12,12 +12,13 @@ PACKAGECONFIG_GL_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '
SRC_URI_append_imxgpu3d = " \
file://0001-glplugin-Change-wayland-default-res-to-1024x768.patch \
- file://0002-Add-directviv-to-glimagesink-to-improve-playback-per.patch \
- file://0003-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch \
- file://0004-Fix-dependence-issue-between-gst-plugin-.patch \
- file://0005-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch \
- file://0006-glwindow-work-around-for-no-frame-when-imxplayer-use.patch \
- file://0007-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch \
+ file://0002-Support-fb-backend-for-gl-plugins.patch \
+ file://0003-Add-directviv-to-glimagesink-to-improve-playback-per.patch \
+ file://0004-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch \
+ file://0005-Fix-dependence-issue-between-gst-plugin-.patch \
+ file://0006-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch \
+ file://0007-glwindow-work-around-for-no-frame-when-imxplayer-use.patch \
+ file://0008-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2 2/2] gstreamer1.0-plugins-bad: Fix build issue on non-GPU SoC
2016-11-01 6:09 [PATCH v2 0/2] Add patches for gstreamer1.0-plugins-bad V1.8.3 Yuqing Zhu
2016-11-01 6:09 ` [PATCH v2 1/2] gstreamer1.0-plugins-bad: Support fb backend for gl plugins Yuqing Zhu
@ 2016-11-01 6:09 ` Yuqing Zhu
1 sibling, 0 replies; 3+ messages in thread
From: Yuqing Zhu @ 2016-11-01 6:09 UTC (permalink / raw)
To: meta-freescale; +Cc: Yuqing Zhu
1. Add directviv and g2d check in configure.ac
2. Add compile marcos in glupload and gldownload
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
---
...MFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch | 454 +++++++++++++++++++++
.../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 1 +
2 files changed, 455 insertions(+)
create mode 100755 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch
new file mode 100755
index 0000000..44bb7b0
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch
@@ -0,0 +1,454 @@
+From 506dd50401d4f702d92540db9cb90a752e6817aa Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Mon, 31 Oct 2016 15:22:01 +0800
+Subject: [PATCH] [MMFMWK-7308] Fix build issue on non-GPU soc.
+
+1.Add directviv and g2d check in configure.ac
+2.Add compile marcos in glupload and gldownload
+
+Upstream-Status: Inappropriate [i.MX specific]
+
+Signed-off-by: Haihua Hu <jared.hu@nxp.com>
+---
+ configure.ac | 27 +++++++++++++++-
+ ext/gl/gstgldownloadelement.c | 21 ++++++++++---
+ gst-libs/gst/gl/Makefile.am | 22 ++++++++++---
+ gst-libs/gst/gl/gstglbufferpool.c | 4 ++-
+ gst-libs/gst/gl/gstglupload.c | 66 ++++++++++++++++++++++-----------------
+ 5 files changed, 100 insertions(+), 40 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9d007f1..655e019 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -682,7 +682,9 @@ save_LIBS="$LIBS"
+ HAVE_GL=no
+ HAVE_GLES2=no
+ HAVE_WAYLAND_EGL=no
+-HAV_FB_EGL=no
++HAVE_FB_EGL=no
++HAVE_DIRECTVIV=no
++HAVE_G2D=no
+
+ HAVE_EGL_RPI=no
+
+@@ -722,6 +724,10 @@ case $host in
+ dnl check for imx fbbackend support
+ AC_CHECK_LIB(EGL, fbGetDisplay, HAVE_FB_EGL=yes, HAVE_FB_EGL=no)
+
++ dnl specific check for imx soc
++ AC_CHECK_LIB(GLESv2, glTexDirectVIV, HAVE_DIRECTVIV=yes, HAVE_DIRECTVIV=no)
++ AC_CHECK_HEADER(g2d.h, HAVE_G2D=yes, HAVE_G2D=no)
++
+ dnl FIXME: Mali EGL depends on GLESv1 or GLESv2
+ AC_CHECK_HEADER([EGL/fbdev_window.h],
+ [
+@@ -820,6 +826,18 @@ if test "x$HAVE_GLES2" = "xno"; then
+ fi
+ fi
+
++dnl specific for imx soc
++GST_GL_HAVE_DIRECTVIV=0
++GST_GL_HAVE_PHYMEM=0
++if test "x$HAVE_DIRECTVIV" = "xyes"; then
++ GST_GL_HAVE_DIRECTVIV=1
++ if test "x$HAVE_G2D" = "xyes"; then
++ GST_GL_HAVE_PHYMEM=1
++ else
++ AC_MSG_WARN([Physical memory do not support])
++ fi
++fi
++
+ dnl X, GLX and OpenGL
+ if test "x$HAVE_X" = "xno"; then
+ if test "x$NEED_GLX" = "xyes"; then
+@@ -1265,6 +1283,8 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
+
+ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
+ #define GST_GL_HAVE_DMABUF $GST_GL_HAVE_DMABUF
++#define GST_GL_HAVE_DIRECTVIV $GST_GL_HAVE_DIRECTVIV
++#define GST_GL_HAVE_PHYMEM $GST_GL_HAVE_PHYMEM
+ "
+
+ dnl Check for no platforms/window systems
+@@ -1300,6 +1320,9 @@ if test "x$GL_APIS" = "x" -o "x$GL_PLATFORMS" = "x" -o "x$GL_WINDOWS" = "x"; the
+ HAVE_WINDOW_COCOA=no
+ HAVE_WINDOW_EAGL=no
+ HAVE_WINDOW_FB=no
++
++ HAVE_DIRECTVIV=no
++ HAVE_G2D=no
+ fi
+
+ AC_SUBST(GL_LIBS)
+@@ -1316,6 +1339,8 @@ AM_CONDITIONAL(HAVE_WINDOW_WAYLAND, test "x$HAVE_WINDOW_WAYLAND" = "xyes")
+ AM_CONDITIONAL(HAVE_WINDOW_ANDROID, test "x$HAVE_WINDOW_ANDROID" = "xyes")
+ AM_CONDITIONAL(HAVE_WINDOW_EAGL, test "x$HAVE_WINDOW_EAGL" = "xyes")
+ AM_CONDITIONAL(HAVE_WINDOW_FB, test "x$HAVE_WINDOW_FB" = "xyes")
++AM_CONDITIONAL(HAVE_DIRECTVIV, test "x$HAVE_DIRECTVIV" = "xyes")
++AM_CONDITIONAL(HAVE_PHYMEM, test "x$HAVE_DIRECTVIV" = "xyes" -a "x$HAVE_G2D" = "xyes")
+
+ AM_CONDITIONAL(USE_OPENGL, test "x$USE_OPENGL" = "xyes")
+ AM_CONDITIONAL(USE_GLES2, test "x$USE_GLES2" = "xyes")
+diff --git a/ext/gl/gstgldownloadelement.c b/ext/gl/gstgldownloadelement.c
+index 9ea0146..e89c36e 100644
+--- a/ext/gl/gstgldownloadelement.c
++++ b/ext/gl/gstgldownloadelement.c
+@@ -23,9 +23,12 @@
+ #endif
+
+ #include <gst/gl/gl.h>
+-#include <gst/gl/gstglphymemory.h>
+ #include "gstgldownloadelement.h"
+
++#if GST_GL_HAVE_PHYMEM
++#include <gst/gl/gstglphymemory.h>
++#endif
++
+ GST_DEBUG_CATEGORY_STATIC (gst_gl_download_element_debug);
+ #define GST_CAT_DEFAULT gst_gl_download_element_debug
+
+@@ -33,7 +36,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_download_element_debug);
+ G_DEFINE_TYPE_WITH_CODE (GstGLDownloadElement, gst_gl_download_element,
+ GST_TYPE_GL_BASE_FILTER,
+ GST_DEBUG_CATEGORY_INIT (gst_gl_download_element_debug, "gldownloadelement",
+- 0, "download element"););
++ 0, "download element");
++ );
+
+ static gboolean gst_gl_download_element_get_unit_size (GstBaseTransform * trans,
+ GstCaps * caps, gsize * size);
+@@ -170,6 +174,7 @@ gst_gl_download_element_prepare_output_buffer (GstBaseTransform * bt,
+ gint i, n;
+ GstGLMemory *glmem;
+
++#if GST_GL_HAVE_PHYMEM
+ glmem = gst_buffer_peek_memory (inbuf, 0);
+ if (gst_is_gl_physical_memory (glmem)) {
+ GstGLContext *context = GST_GL_BASE_FILTER (bt)->context;
+@@ -182,6 +187,7 @@ gst_gl_download_element_prepare_output_buffer (GstBaseTransform * bt,
+
+ return GST_FLOW_OK;
+ }
++#endif /* GST_GL_HAVE_PHYMEM */
+
+ *outbuf = inbuf;
+
+@@ -235,19 +241,23 @@ gst_gl_download_element_propose_allocation (GstBaseTransform * bt,
+ return FALSE;
+ }
+
+- GST_DEBUG_OBJECT (bt, "video format is %s", gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&info)));
++ GST_DEBUG_OBJECT (bt, "video format is %s",
++ gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&info)));
+
+ gst_allocation_params_init (¶ms);
++
++#if GST_GL_HAVE_PHYMEM
+ if (gst_is_gl_physical_memory_supported_fmt (&info)) {
+ allocator = gst_phy_mem_allocator_obtain ();
+ GST_DEBUG_OBJECT (bt, "obtain physical memory allocator %p.", allocator);
+ }
++#endif /* GST_GL_HAVE_PHYMEM */
+
+ if (!allocator)
+ allocator = gst_allocator_find (GST_GL_MEMORY_ALLOCATOR_NAME);
+
+ if (!allocator) {
+- GST_ERROR_OBJECT (bt, "Can't obtain physical memory allocator.");
++ GST_ERROR_OBJECT (bt, "Can't obtain gl memory allocator.");
+ return FALSE;
+ }
+
+@@ -268,7 +278,8 @@ gst_gl_download_element_propose_allocation (GstBaseTransform * bt,
+ /* the normal size of a frame */
+ size = info.size;
+ gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+- gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_GL_SYNC_META);
++ gst_buffer_pool_config_add_option (config,
++ GST_BUFFER_POOL_OPTION_GL_SYNC_META);
+
+ if (!gst_buffer_pool_set_config (pool, config)) {
+ gst_object_unref (pool);
+diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
+index 55f8a20..c52bba5 100644
+--- a/gst-libs/gst/gl/Makefile.am
++++ b/gst-libs/gst/gl/Makefile.am
+@@ -33,10 +33,16 @@ libgstgl_@GST_API_VERSION@_la_SOURCES = \
+ gstglviewconvert.c \
+ gstgloverlaycompositor.c \
+ gstglquery.c \
+- gstglvivdirecttexture.c \
+- gstglphymemory.c \
+ gstglcontrolbindingproxy.c
+
++if HAVE_DIRECTVIV
++libgstgl_@GST_API_VERSION@_la_SOURCES += gstglvivdirecttexture.c
++endif
++
++if HAVE_PHYMEM
++libgstgl_@GST_API_VERSION@_la_SOURCES += gstglphymemory.c
++endif
++
+ libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
+ libgstgl_@GST_API_VERSION@include_HEADERS = \
+ gstglwindow.h \
+@@ -68,10 +74,16 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
+ gstglcontrolbindingproxy.h \
+ gstgl_fwd.h \
+ gstgl_enums.h \
+- gstglvivdirecttexture.h \
+- gstglphymemory.h \
+ gl.h
+
++if HAVE_DIRECTVIV
++libgstgl_@GST_API_VERSION@include_HEADERS += gstglvivdirecttexture.h
++endif
++
++if HAVE_PHYMEM
++libgstgl_@GST_API_VERSION@include_HEADERS += gstglphymemory.h
++endif
++
+ noinst_HEADERS = \
+ gstglsl_private.h \
+ utils/opengl_versions.h \
+@@ -86,7 +98,9 @@ libgstgl_@GST_API_VERSION@_la_LIBADD = \
+ $(GST_LIBS) \
+ $(GL_LIBS)
+
++if HAVE_PHYMEM
+ libgstgl_@GST_API_VERSION@_la_LIBADD += -lg2d
++endif
+
+ if HAVE_WINDOW_WIN32
+ SUBDIRS += win32
+diff --git a/gst-libs/gst/gl/gstglbufferpool.c b/gst-libs/gst/gl/gstglbufferpool.c
+index 71c726a..77452be 100644
+--- a/gst-libs/gst/gl/gstglbufferpool.c
++++ b/gst-libs/gst/gl/gstglbufferpool.c
+@@ -292,8 +292,9 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
+ }
+ #endif
+
++#if GST_GL_HAVE_PHYMEM
+ if ((g_strcmp0 (priv->allocator->mem_type, GST_GL_PHY_MEM_ALLOCATOR) == 0)) {
+- GstAllocator* allocator = (GstAllocator*) gst_phy_mem_allocator_obtain ();
++ GstAllocator *allocator = (GstAllocator *) gst_phy_mem_allocator_obtain ();
+ if (!gst_gl_physical_memory_setup_buffer (allocator, buf, priv->gl_params)) {
+ GST_ERROR_OBJECT (pool, "Can't create physcial buffer.");
+ return GST_FLOW_ERROR;
+@@ -301,6 +302,7 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
+ *buffer = buf;
+ return GST_FLOW_OK;
+ }
++#endif
+
+ alloc = GST_GL_MEMORY_ALLOCATOR (priv->allocator);
+ if (!gst_gl_memory_setup_buffer (alloc, buf, priv->gl_params))
+diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c
+index 99cc68a..d17fab3 100644
+--- a/gst-libs/gst/gl/gstglupload.c
++++ b/gst-libs/gst/gl/gstglupload.c
+@@ -23,7 +23,6 @@
+ #endif
+
+ #include <stdio.h>
+-#include <gst/gl/gstglvivdirecttexture.h>
+
+ #include "gl.h"
+ #include "gstglupload.h"
+@@ -36,6 +35,9 @@
+ #include <gst/allocators/gstdmabuf.h>
+ #endif
+
++#if GST_GL_HAVE_DIRECTVIV
++#include <gst/gl/gstglvivdirecttexture.h>
++#endif
+ /**
+ * SECTION:gstglupload
+ * @short_description: an object that uploads to GL textures
+@@ -316,8 +318,8 @@ _gl_memory_upload_propose_allocation (gpointer impl, GstQuery * decide_query,
+ gst_allocation_params_init (¶ms);
+
+ allocator =
+- GST_ALLOCATOR (gst_gl_memory_allocator_get_default (upload->
+- upload->context));
++ GST_ALLOCATOR (gst_gl_memory_allocator_get_default (upload->upload->
++ context));
+ gst_query_add_allocation_param (query, allocator, ¶ms);
+ gst_object_unref (allocator);
+ }
+@@ -603,8 +605,8 @@ _egl_image_upload_perform_gl_thread (GstGLContext * context,
+ }
+
+ if (GST_IS_GL_BUFFER_POOL (image->buffer->pool))
+- gst_gl_buffer_pool_replace_last_buffer (GST_GL_BUFFER_POOL (image->
+- buffer->pool), image->buffer);
++ gst_gl_buffer_pool_replace_last_buffer (GST_GL_BUFFER_POOL (image->buffer->
++ pool), image->buffer);
+ }
+
+ static GstGLUploadReturn
+@@ -1045,11 +1047,11 @@ _upload_meta_upload_propose_allocation (gpointer impl, GstQuery * decide_query,
+ gpointer handle;
+
+ gl_apis =
+- gst_gl_api_to_string (gst_gl_context_get_gl_api (upload->upload->
+- context));
+- platform =
+- gst_gl_platform_to_string (gst_gl_context_get_gl_platform (upload->
++ gst_gl_api_to_string (gst_gl_context_get_gl_api (upload->
+ upload->context));
++ platform =
++ gst_gl_platform_to_string (gst_gl_context_get_gl_platform
++ (upload->upload->context));
+ handle = (gpointer) gst_gl_context_get_gl_context (upload->upload->context);
+
+ gl_context =
+@@ -1170,6 +1172,7 @@ static const UploadMethod _upload_meta_upload = {
+ &_upload_meta_upload_free
+ };
+
++#if GST_GL_HAVE_DIRECTVIV
+ struct PhyBufferUpload
+ {
+ GstGLUpload *upload;
+@@ -1177,7 +1180,7 @@ struct PhyBufferUpload
+ };
+
+ static gpointer
+-_physical_buffer_upload_new(GstGLUpload *upload)
++_physical_buffer_upload_new (GstGLUpload * upload)
+ {
+ struct PhyBufferUpload *phybuffer = g_new0 (struct PhyBufferUpload, 1);
+
+@@ -1187,8 +1190,8 @@ _physical_buffer_upload_new(GstGLUpload *upload)
+ }
+
+ static GstCaps *
+-_physical_buffer_upload_transform_caps(GstGLContext *context,
+- GstPadDirection direction, GstCaps *caps)
++_physical_buffer_upload_transform_caps (GstGLContext * context,
++ GstPadDirection direction, GstCaps * caps)
+ {
+ GstCapsFeatures *passthrough =
+ gst_caps_features_from_string
+@@ -1208,7 +1211,7 @@ _physical_buffer_upload_transform_caps(GstGLContext *context,
+ ret = tmp;
+ } else {
+ ret = gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+- (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,GST_GL_DIRECTVIV_FORMAT));
++ (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, GST_GL_DIRECTVIV_FORMAT));
+ }
+
+ gst_caps_features_free (passthrough);
+@@ -1216,16 +1219,16 @@ _physical_buffer_upload_transform_caps(GstGLContext *context,
+ }
+
+ static gboolean
+-_physical_buffer_upload_accept(gpointer impl, GstBuffer *buffer,
+- GstCaps *in_caps, GstCaps *out_caps)
++_physical_buffer_upload_accept (gpointer impl, GstBuffer * buffer,
++ GstCaps * in_caps, GstCaps * out_caps)
+ {
+- struct PhyBufferUpload *upload = impl;
++ struct PhyBufferUpload *upload = impl;
+ GstCapsFeatures *features;
+
+ features = gst_caps_get_features (out_caps, 0);
+ if (!gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_GL_MEMORY))
+ return FALSE;
+-
++
+ if (upload->params)
+ gst_gl_allocation_params_free ((GstGLAllocationParams *) upload->params);
+ if (!(upload->params =
+@@ -1234,18 +1237,19 @@ _physical_buffer_upload_accept(gpointer impl, GstBuffer *buffer,
+ GST_GL_TEXTURE_TARGET_2D)))
+ return FALSE;
+
+- return gst_is_physical_buffer(buffer);
++ return gst_is_physical_buffer (buffer);
+ }
+
+ static void
+-_physical_buffer_upload_propose_allocation(gpointer impl, GstQuery *decide_query,
+- GstQuery *query)
++_physical_buffer_upload_propose_allocation (gpointer impl,
++ GstQuery * decide_query, GstQuery * query)
+ {
+ gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0);
+ }
+
+ static GstGLUploadReturn
+-_physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **outbuf)
++_physical_buffer_upload_perform (gpointer impl, GstBuffer * buffer,
++ GstBuffer ** outbuf)
+ {
+ struct PhyBufferUpload *phyBuffer = impl;
+ GstGLMemoryAllocator *allocator;
+@@ -1255,7 +1259,7 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou
+ info = &phyBuffer->upload->priv->out_info;
+ n_mem = GST_VIDEO_INFO_N_PLANES (info);
+ GST_LOG_OBJECT (phyBuffer->upload, "Attempting viv direct upload");
+-
++
+ allocator =
+ GST_GL_MEMORY_ALLOCATOR (gst_allocator_find
+ (GST_GL_MEMORY_PBO_ALLOCATOR_NAME));
+@@ -1265,11 +1269,10 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou
+ gst_gl_memory_setup_buffer (allocator, *outbuf, phyBuffer->params);
+ gst_object_unref (allocator);
+
+- GstGLMemory *out_gl_mem =
+- (GstGLMemory *) gst_buffer_peek_memory (*outbuf, 0);
++ GstGLMemory *out_gl_mem = (GstGLMemory *) gst_buffer_peek_memory (*outbuf, 0);
+
+- gst_gl_viv_direct_bind_gstbuffer(phyBuffer->upload->context, out_gl_mem->tex_id,
+- &phyBuffer->upload->priv->in_info, buffer);
++ gst_gl_viv_direct_bind_gstbuffer (phyBuffer->upload->context,
++ out_gl_mem->tex_id, &phyBuffer->upload->priv->in_info, buffer);
+
+ gst_buffer_add_video_meta_full (*outbuf, 0,
+ GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
+@@ -1279,14 +1282,14 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou
+ }
+
+ static void
+-_physical_buffer_upload_free(gpointer impl)
++_physical_buffer_upload_free (gpointer impl)
+ {
+ struct PhyBufferUpload *phyBuffer = impl;
+
+ if (phyBuffer->params)
+ gst_gl_allocation_params_free ((GstGLAllocationParams *) phyBuffer->params);
+
+- g_free(phyBuffer);
++ g_free (phyBuffer);
+ }
+
+ static GstStaticCaps _physical_buffer_upload_caps =
+@@ -1303,6 +1306,7 @@ static const UploadMethod _physical_buffer_upload = {
+ &_physical_buffer_upload_perform,
+ &_physical_buffer_upload_free
+ };
++#endif /* GST_GL_HAVE_DIRECTVIV */
+
+ struct RawUploadFrame
+ {
+@@ -1526,7 +1530,11 @@ static const UploadMethod *upload_methods[] = { &_gl_memory_upload,
+ #if GST_GL_HAVE_DMABUF
+ &_dma_buf_upload,
+ #endif
+- &_upload_meta_upload, &_physical_buffer_upload, &_raw_data_upload
++ &_upload_meta_upload,
++#if GST_GL_HAVE_DIRECTVIV
++ &_physical_buffer_upload,
++#endif
++ &_raw_data_upload
+ };
+
+ static GMutex upload_global_lock;
+--
+1.9.1
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 9ee82a8..110bd8d 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -19,6 +19,7 @@ SRC_URI_append_imxgpu3d = " \
file://0006-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch \
file://0007-glwindow-work-around-for-no-frame-when-imxplayer-use.patch \
file://0008-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch \
+ file://0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread