* [poky][PATCH 1/6] gstreamer1.0-plugins-bad: Enable gldeinterlace on OpenGL ES
2016-07-04 5:46 [poky][PATCH 0/6] Add patches for gstreamer1.0-plugins-bad V1.8.2 Yuqing Zhu
@ 2016-07-04 5:46 ` Yuqing Zhu
2016-07-04 10:18 ` Burton, Ross
2016-12-15 11:37 ` Nicolas Dechesne
2016-07-04 5:46 ` [poky][PATCH 2/6] gstreamer1.0-plugins-bad: Implement multiple render targets for GLES3 Yuqing Zhu
` (4 subsequent siblings)
5 siblings, 2 replies; 10+ messages in thread
From: Yuqing Zhu @ 2016-07-04 5:46 UTC (permalink / raw)
To: openembedded-core; +Cc: Yuqing Zhu
Enable gldeinterlace on OpenGL ES to improve performance.
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
---
...lplugin-enable-gldeinterlace-on-OpenGL-ES.patch | 634 +++++++++++++++++++++
.../gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb | 1 +
2 files changed, 635 insertions(+)
create mode 100755 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch
new file mode 100755
index 0000000..175e822
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch
@@ -0,0 +1,634 @@
+From 8a0e97f7e672301cc76e394855e8c7a3448b0249 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Fri, 8 Apr 2016 16:47:15 +0800
+Subject: [PATCH 4/6] [glplugin] enable gldeinterlace on OpenGL ES
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+1.Porting the exist deinterlace shader and OpenGL callback
+ to be compatible with OpenGL ES.
+2.Add a our blur vertical shader to gldeinterlace.
+3.Add a property named “method” to let user choose which
+ deinterlace function to use. Default to choose blur vertical
+ method for better performance.
+
+Upstream-Status: Pending
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764873
+
+Signed-off-by: Haihua Hu <jared.hu@nxp.com>
+---
+ ext/gl/Makefile.am | 4 +-
+ ext/gl/gstgldeinterlace.c | 344 +++++++++++++++++++++++++++++++++++-----------
+ ext/gl/gstgldeinterlace.h | 6 +-
+ ext/gl/gstopengl.c | 13 +-
+ 4 files changed, 275 insertions(+), 92 deletions(-)
+
+diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am
+index 5d55f54..46419a7 100644
+--- a/ext/gl/Makefile.am
++++ b/ext/gl/Makefile.am
+@@ -40,6 +40,7 @@ libgstopengl_la_SOURCES = \
+ gstglfilterapp.c \
+ gstglviewconvert.c \
+ gstglstereosplit.c \
++ gstgldeinterlace.c \
+ gstglstereomix.c
+
+ noinst_HEADERS = \
+@@ -63,20 +64,19 @@ noinst_HEADERS = \
+ gstglfilterapp.h \
+ gstglstereosplit.h \
+ gstglstereomix.h \
++ gstgldeinterlace.h \
+ gstglviewconvert.h
+
+ # full opengl required
+ if USE_OPENGL
+ libgstopengl_la_SOURCES += \
+ gstglfilterglass.c \
+- gstgldeinterlace.c \
+ gltestsrc.c \
+ gstgltestsrc.c \
+ gstglmosaic.c
+
+ noinst_HEADERS += \
+ gstglfilterglass.h \
+- gstgldeinterlace.h \
+ gltestsrc.h \
+ gstgltestsrc.h \
+ gstglmosaic.h \
+diff --git a/ext/gl/gstgldeinterlace.c b/ext/gl/gstgldeinterlace.c
+index bd0eff0..c1250dc 100644
+--- a/ext/gl/gstgldeinterlace.c
++++ b/ext/gl/gstgldeinterlace.c
+@@ -43,7 +43,8 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
+
+ enum
+ {
+- PROP_0
++ PROP_0,
++ PROP_METHOD
+ };
+
+ #define DEBUG_INIT \
+@@ -57,17 +58,23 @@ static void gst_gl_deinterlace_set_property (GObject * object,
+ static void gst_gl_deinterlace_get_property (GObject * object,
+ guint prop_id, GValue * value, GParamSpec * pspec);
+
++static gboolean gst_gl_deinterlace_start (GstBaseTransform * trans);
+ static gboolean gst_gl_deinterlace_reset (GstBaseTransform * trans);
+-static gboolean gst_gl_deinterlace_init_shader (GstGLFilter * filter);
++static gboolean gst_gl_deinterlace_init_fbo (GstGLFilter * filter);
+ static gboolean gst_gl_deinterlace_filter (GstGLFilter * filter,
+ GstBuffer * inbuf, GstBuffer * outbuf);
+ static gboolean gst_gl_deinterlace_filter_texture (GstGLFilter * filter,
+ guint in_tex, guint out_tex);
+-static void gst_gl_deinterlace_callback (gint width, gint height,
++static void gst_gl_deinterlace_vfir_callback (gint width, gint height,
++ guint texture, gpointer stuff);
++static void gst_gl_deinterlace_greedyh_callback (gint width, gint height,
+ guint texture, gpointer stuff);
+
+ /* *INDENT-OFF* */
+ static const gchar *greedyh_fragment_source =
++ "#ifdef GL_ES\n"
++ "precision mediump float;\n"
++ "#endif\n"
+ "uniform sampler2D tex;\n"
+ "uniform sampler2D tex_prev;\n"
+ "uniform float max_comb;\n"
+@@ -75,35 +82,35 @@ static const gchar *greedyh_fragment_source =
+ "uniform float motion_sense;\n"
+ "uniform float width;\n"
+ "uniform float height;\n"
++ "varying vec2 v_texcoord;\n"
+
+ "void main () {\n"
+- " vec2 texcoord = gl_TexCoord[0].xy;\n"
+- " if (int(mod(texcoord.y * height, 2.0)) == 0) {\n"
+- " gl_FragColor = vec4(texture2D(tex_prev, texcoord).rgb, 1.0);\n"
++ " if (int(mod(v_texcoord.y * height, 2.0)) == 0) {\n"
++ " gl_FragColor = vec4(texture2D(tex_prev, v_texcoord).rgb, 1.0);\n"
+ " } else {\n"
+ " vec2 texcoord_L1_a1, texcoord_L3_a1, texcoord_L1, texcoord_L3, texcoord_L1_1, texcoord_L3_1;\n"
+ " vec3 L1_a1, L3_a1, L1, L3, L1_1, L3_1;\n"
+
+- " texcoord_L1 = vec2(texcoord.x, texcoord.y - 1.0 / height);\n"
+- " texcoord_L3 = vec2(texcoord.x, texcoord.y + 1.0 / height);\n"
++ " texcoord_L1 = vec2(v_texcoord.x, v_texcoord.y - 1.0 / height);\n"
++ " texcoord_L3 = vec2(v_texcoord.x, v_texcoord.y + 1.0 / height);\n"
+ " L1 = texture2D(tex_prev, texcoord_L1).rgb;\n"
+ " L3 = texture2D(tex_prev, texcoord_L3).rgb;\n"
+- " if (texcoord.x == 1.0 && texcoord.y == 1.0) {\n"
++ " if (v_texcoord.x == 1.0 && v_texcoord.y == 1.0) {\n"
+ " L1_1 = L1;\n"
+ " L3_1 = L3;\n"
+ " } else {\n"
+- " texcoord_L1_1 = vec2(texcoord.x + 1.0 / width, texcoord.y - 1.0 / height);\n"
+- " texcoord_L3_1 = vec2(texcoord.x + 1.0 / width, texcoord.y + 1.0 / height);\n"
++ " texcoord_L1_1 = vec2(v_texcoord.x + 1.0 / width, v_texcoord.y - 1.0 / height);\n"
++ " texcoord_L3_1 = vec2(v_texcoord.x + 1.0 / width, v_texcoord.y + 1.0 / height);\n"
+ " L1_1 = texture2D(tex_prev, texcoord_L1_1).rgb;\n"
+ " L3_1 = texture2D(tex_prev, texcoord_L3_1).rgb;\n"
+ " }\n"
+
+- " if (int(ceil(texcoord.x + texcoord.y)) == 0) {\n"
++ " if (int(ceil(v_texcoord.x + v_texcoord.y)) == 0) {\n"
+ " L1_a1 = L1;\n"
+ " L3_a1 = L3;\n"
+ " } else {\n"
+- " texcoord_L1_a1 = vec2(texcoord.x - 1.0 / width, texcoord.y - 1.0 / height);\n"
+- " texcoord_L3_a1 = vec2(texcoord.x - 1.0 / width, texcoord.y + 1.0 / height);\n"
++ " texcoord_L1_a1 = vec2(v_texcoord.x - 1.0 / width, v_texcoord.y - 1.0 / height);\n"
++ " texcoord_L3_a1 = vec2(v_texcoord.x - 1.0 / width, v_texcoord.y + 1.0 / height);\n"
+ " L1_a1 = texture2D(tex_prev, texcoord_L1_a1).rgb;\n"
+ " L3_a1 = texture2D(tex_prev, texcoord_L3_a1).rgb;\n"
+ " }\n"
+@@ -113,8 +120,8 @@ static const gchar *greedyh_fragment_source =
+ " vec3 avg_1 = (L1_1 + L3_1) / 2.0;\n"
+ " vec3 avg_s = (avg_a1 + avg_1) / 2.0;\n"
+ " vec3 avg_sc = (avg_s + avg) / 2.0;\n"
+- " vec3 L2 = texture2D(tex, texcoord).rgb;\n"
+- " vec3 LP2 = texture2D(tex_prev, texcoord).rgb;\n"
++ " vec3 L2 = texture2D(tex, v_texcoord).rgb;\n"
++ " vec3 LP2 = texture2D(tex_prev, v_texcoord).rgb;\n"
+ " vec3 best;\n"
+ " if (abs(L2.r - avg_sc.r) < abs(LP2.r - avg_sc.r)) {\n"
+ " best.r = L2.r;\n" " } else {\n"
+@@ -144,8 +151,87 @@ static const gchar *greedyh_fragment_source =
+ " gl_FragColor = vec4(last, 1.0);\n"
+ " }\n"
+ "}\n";
++
++const gchar *vfir_fragment_source =
++ "#ifdef GL_ES\n"
++ "precision mediump float;\n"
++ "#endif\n"
++ "uniform sampler2D tex;\n"
++ "uniform float width;\n"
++ "uniform float height;\n"
++ "varying vec2 v_texcoord;\n"
++ "void main()\n"
++ "{\n"
++ " vec2 topcoord, botcoord;\n"
++ " vec4 cur_color, top_color, bot_color;\n"
++ " topcoord.x = v_texcoord.x;\n"
++ " botcoord.x = v_texcoord.x;\n"
++ " if (v_texcoord.y == 0.0 || v_texcoord.y == 1.0) {\n"
++ " topcoord.y = v_texcoord.y ;\n"
++ " botcoord.y = v_texcoord.y ;\n"
++ " }\n"
++ " else {\n"
++ " topcoord.y = v_texcoord.y - 1.0/height;\n"
++ " botcoord.y = v_texcoord.y + 1.0/height;\n"
++ " }\n"
++ " cur_color = texture2D(tex, v_texcoord);\n"
++ " top_color = texture2D(tex, topcoord);\n"
++ " bot_color = texture2D(tex, botcoord);\n"
++ " gl_FragColor = 0.5*cur_color + 0.25*top_color + 0.25*bot_color;\n"
++ "}";
+ /* *INDENT-ON* */
+
++/* dont' forget to edit the following when a new method is added */
++typedef enum
++{
++ GST_GL_DEINTERLACE_VFIR,
++ GST_GL_DEINTERLACE_GREEDYH
++} GstGLDeinterlaceMethod;
++
++static const GEnumValue *
++gst_gl_deinterlace_get_methods (void)
++{
++ static const GEnumValue method_types[] = {
++ {GST_GL_DEINTERLACE_VFIR, "Blur Vertical", "vfir"},
++ {GST_GL_DEINTERLACE_GREEDYH, "Motion Adaptive: Advanced Detection",
++ "greedhy"},
++ {0, NULL, NULL}
++ };
++ return method_types;
++}
++
++#define GST_TYPE_GL_DEINTERLACE_METHODS (gst_gl_deinterlace_method_get_type ())
++static GType
++gst_gl_deinterlace_method_get_type (void)
++{
++ static GType gl_deinterlace_method_type = 0;
++ if (!gl_deinterlace_method_type) {
++ gl_deinterlace_method_type =
++ g_enum_register_static ("GstGLDeinterlaceMethod",
++ gst_gl_deinterlace_get_methods ());
++ }
++ return gl_deinterlace_method_type;
++}
++
++static void
++gst_gl_deinterlace_set_method (GstGLDeinterlace * deinterlace,
++ guint method_types)
++{
++ switch (method_types) {
++ case GST_GL_DEINTERLACE_VFIR:
++ deinterlace->deinterlacefunc = gst_gl_deinterlace_vfir_callback;
++ deinterlace->current_method = method_types;
++ break;
++ case GST_GL_DEINTERLACE_GREEDYH:
++ deinterlace->deinterlacefunc = gst_gl_deinterlace_greedyh_callback;
++ deinterlace->current_method = method_types;
++ break;
++ default:
++ g_assert_not_reached ();
++ break;
++ }
++}
++
+ static void
+ gst_gl_deinterlace_class_init (GstGLDeinterlaceClass * klass)
+ {
+@@ -163,25 +249,60 @@ gst_gl_deinterlace_class_init (GstGLDeinterlaceClass * klass)
+ "Deinterlacing based on fragment shaders",
+ "Julien Isorce <julien.isorce@mail.com>");
+
++ g_object_class_install_property (gobject_class,
++ PROP_METHOD,
++ g_param_spec_enum ("method",
++ "Deinterlace Method",
++ "Select which deinterlace method apply to GL video texture",
++ GST_TYPE_GL_DEINTERLACE_METHODS,
++ GST_GL_DEINTERLACE_VFIR, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
++
++ GST_BASE_TRANSFORM_CLASS (klass)->start = gst_gl_deinterlace_start;
+ GST_BASE_TRANSFORM_CLASS (klass)->stop = gst_gl_deinterlace_reset;
+
+ GST_GL_FILTER_CLASS (klass)->filter = gst_gl_deinterlace_filter;
+ GST_GL_FILTER_CLASS (klass)->filter_texture =
+ gst_gl_deinterlace_filter_texture;
+- GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_deinterlace_init_shader;
++ GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_deinterlace_init_fbo;
+
+- GST_GL_BASE_FILTER_CLASS (klass)->supported_gl_api = GST_GL_API_OPENGL;
++ GST_GL_BASE_FILTER_CLASS (klass)->supported_gl_api =
++ GST_GL_API_OPENGL | GST_GL_API_GLES2 | GST_GL_API_OPENGL3;
+ }
+
+ static void
+ gst_gl_deinterlace_init (GstGLDeinterlace * filter)
+ {
+- filter->shader = NULL;
++ filter->shaderstable = NULL;
++ filter->deinterlacefunc = gst_gl_deinterlace_vfir_callback;
++ filter->current_method = GST_GL_DEINTERLACE_VFIR;
+ filter->prev_buffer = NULL;
+ filter->prev_tex = 0;
+ }
+
+ static gboolean
++gst_gl_deinterlace_start (GstBaseTransform * trans)
++{
++ GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (trans);
++
++ deinterlace_filter->shaderstable = g_hash_table_new (g_str_hash, g_str_equal);
++
++ return GST_BASE_TRANSFORM_CLASS (parent_class)->start (trans);
++}
++
++static void
++gst_gl_deinterlace_ghash_func_clean (gpointer key, gpointer value,
++ gpointer data)
++{
++ GstGLShader *shader = (GstGLShader *) value;
++ GstGLFilter *filter = (GstGLFilter *) data;
++
++ //blocking call, wait the opengl thread has destroyed the shader
++ gst_gl_context_del_shader (GST_GL_BASE_FILTER (filter)->context, shader);
++
++ value = NULL;
++}
++
++static gboolean
+ gst_gl_deinterlace_reset (GstBaseTransform * trans)
+ {
+ GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (trans);
+@@ -189,10 +310,17 @@ gst_gl_deinterlace_reset (GstBaseTransform * trans)
+ gst_buffer_replace (&deinterlace_filter->prev_buffer, NULL);
+
+ //blocking call, wait the opengl thread has destroyed the shader
+- if (deinterlace_filter->shader)
+- gst_gl_context_del_shader (GST_GL_BASE_FILTER (trans)->context,
+- deinterlace_filter->shader);
+- deinterlace_filter->shader = NULL;
++ if (deinterlace_filter->shaderstable) {
++ /* release shaders in the gl thread */
++ g_hash_table_foreach (deinterlace_filter->shaderstable,
++ gst_gl_deinterlace_ghash_func_clean, deinterlace_filter);
++
++ /* clean the htable without calling values destructors
++ * because shaders have been released in the glthread
++ * through the foreach func */
++ g_hash_table_unref (deinterlace_filter->shaderstable);
++ deinterlace_filter->shaderstable = NULL;
++ }
+
+ return GST_BASE_TRANSFORM_CLASS (parent_class)->stop (trans);
+ }
+@@ -201,9 +329,12 @@ static void
+ gst_gl_deinterlace_set_property (GObject * object, guint prop_id,
+ const GValue * value, GParamSpec * pspec)
+ {
+- //GstGLDeinterlace *filter = GST_GL_DEINTERLACE (object);
++ GstGLDeinterlace *filter = GST_GL_DEINTERLACE (object);
+
+ switch (prop_id) {
++ case PROP_METHOD:
++ gst_gl_deinterlace_set_method (filter, g_value_get_enum (value));
++ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+@@ -214,9 +345,12 @@ static void
+ gst_gl_deinterlace_get_property (GObject * object, guint prop_id,
+ GValue * value, GParamSpec * pspec)
+ {
+- //GstGLDeinterlace *filter = GST_GL_DEINTERLACE (object);
++ GstGLDeinterlace *filter = GST_GL_DEINTERLACE (object);
+
+ switch (prop_id) {
++ case PROP_METHOD:
++ g_value_set_enum (value, filter->current_method);
++ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+@@ -224,13 +358,9 @@ gst_gl_deinterlace_get_property (GObject * object, guint prop_id,
+ }
+
+ static gboolean
+-gst_gl_deinterlace_init_shader (GstGLFilter * filter)
++gst_gl_deinterlace_init_fbo (GstGLFilter * filter)
+ {
+- GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter);
+-
+- //blocking call, wait the opengl thread has compiled the shader
+- return gst_gl_context_gen_shader (GST_GL_BASE_FILTER (filter)->context, 0,
+- greedyh_fragment_source, &deinterlace_filter->shader);
++ return TRUE;
+ }
+
+ static gboolean
+@@ -241,7 +371,7 @@ gst_gl_deinterlace_filter_texture (GstGLFilter * filter, guint in_tex,
+
+ //blocking call, use a FBO
+ gst_gl_filter_render_to_target (filter, TRUE, in_tex, out_tex,
+- gst_gl_deinterlace_callback, deinterlace_filter);
++ deinterlace_filter->deinterlacefunc, deinterlace_filter);
+
+ return TRUE;
+ }
+@@ -259,36 +389,104 @@ gst_gl_deinterlace_filter (GstGLFilter * filter, GstBuffer * inbuf,
+ return TRUE;
+ }
+
+-//opengl scene, params: input texture (not the output filter->texture)
++static GstGLShader *
++gst_gl_deinterlace_get_fragment_shader (GstGLFilter * filter,
++ const gchar * shader_name, const gchar * shader_source)
++{
++ GstGLShader *shader = NULL;
++ GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter);
++ GstGLContext *context = GST_GL_BASE_FILTER (filter)->context;
++
++ shader = g_hash_table_lookup (deinterlace_filter->shaderstable, shader_name);
++
++ if (!shader) {
++ GError *error = NULL;
++
++ if (!(shader = gst_gl_shader_new_link_with_stages (context, &error,
++ gst_glsl_stage_new_default_vertex (context),
++ gst_glsl_stage_new_with_string (context, GL_FRAGMENT_SHADER,
++ GST_GLSL_VERSION_NONE,
++ GST_GLSL_PROFILE_ES | GST_GLSL_PROFILE_COMPATIBILITY,
++ shader_source), NULL))) {
++ GST_ELEMENT_ERROR (deinterlace_filter, RESOURCE, NOT_FOUND,
++ ("Failed to initialize %s shader", shader_name), (NULL));
++ }
++
++ filter->draw_attr_position_loc =
++ gst_gl_shader_get_attribute_location (shader, "a_position");
++ filter->draw_attr_texture_loc =
++ gst_gl_shader_get_attribute_location (shader, "a_texcoord");
++ }
++
++ g_hash_table_insert (deinterlace_filter->shaderstable, (gchar *) shader_name,
++ shader);
++
++ return shader;
++}
++
+ static void
+-gst_gl_deinterlace_callback (gint width, gint height, guint texture,
++gst_gl_deinterlace_vfir_callback (gint width, gint height, guint texture,
+ gpointer stuff)
+ {
+- GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (stuff);
++ GstGLShader *shader;
+ GstGLFilter *filter = GST_GL_FILTER (stuff);
+- GstGLFuncs *gl = GST_GL_BASE_FILTER (filter)->context->gl_vtable;
++ GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter);
++ GstGLContext *context = GST_GL_BASE_FILTER (filter)->context;
++ GstGLFuncs *gl = context->gl_vtable;
++
++ shader = gst_gl_deinterlace_get_fragment_shader (deinterlace_filter, "vfir",
++ vfir_fragment_source);
++
++ if (!shader)
++ return;
++
++#if GST_GL_HAVE_OPENGL
++ if (USING_OPENGL (context)) {
++ gl->MatrixMode (GL_PROJECTION);
++ gl->LoadIdentity ();
++ }
++#endif
++
++ gst_gl_shader_use (shader);
++
++ gl->ActiveTexture (GL_TEXTURE0);
++ gl->BindTexture (GL_TEXTURE_2D, texture);
++
++ gst_gl_shader_set_uniform_1i (shader, "tex", 0);
++ gst_gl_shader_set_uniform_1f (shader, "width",
++ GST_VIDEO_INFO_WIDTH (&filter->out_info));
++ gst_gl_shader_set_uniform_1f (shader, "height",
++ GST_VIDEO_INFO_HEIGHT (&filter->out_info));
++
++ gst_gl_filter_draw_texture (filter, texture, width, height);
++}
++
++static void
++gst_gl_deinterlace_greedyh_callback (gint width, gint height, guint texture,
++ gpointer stuff)
++{
++ GstGLShader *shader;
++ GstGLFilter *filter = GST_GL_FILTER (stuff);
++ GstGLDeinterlace *deinterlace_filter = GST_GL_DEINTERLACE (filter);
++ GstGLContext *context = GST_GL_BASE_FILTER (filter)->context;
++ GstGLFuncs *gl = context->gl_vtable;
+ guint temp;
+
+- GLfloat verts[] = { -1.0, -1.0,
+- 1.0, -1.0,
+- 1.0, 1.0,
+- -1.0, 1.0
+- };
+- GLfloat texcoords0[] = { 0.0f, 0.0f,
+- 1.0f, 0.0f,
+- 1.0f, 1.0f,
+- 0.0f, 1.0f
+- };
+- GLfloat texcoords1[] = { 0.0f, 0.0f,
+- 1.0f, 0.0f,
+- 1.0f, 1.0f,
+- 0.0f, 1.0f
+- };
++ shader =
++ gst_gl_deinterlace_get_fragment_shader (deinterlace_filter, "greedhy",
++ greedyh_fragment_source);
+
+- gl->MatrixMode (GL_PROJECTION);
+- gl->LoadIdentity ();
++ if (!shader)
++ return;
+
+- gst_gl_shader_use (deinterlace_filter->shader);
++#if GST_GL_HAVE_OPENGL
++ if (USING_OPENGL (context)) {
++ gl->MatrixMode (GL_PROJECTION);
++ gl->LoadIdentity ();
++ }
++#endif
++
++ gst_gl_shader_use (shader);
+
+ if (G_UNLIKELY (deinterlace_filter->prev_tex == 0)) {
+ gst_gl_context_gen_texture (GST_GL_BASE_FILTER (filter)->context,
+@@ -298,44 +496,24 @@ gst_gl_deinterlace_callback (gint width, gint height, guint texture,
+ GST_VIDEO_INFO_HEIGHT (&filter->out_info));
+ } else {
+ gl->ActiveTexture (GL_TEXTURE1);
+- gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "tex_prev", 1);
++ gst_gl_shader_set_uniform_1i (shader, "tex_prev", 1);
+ gl->BindTexture (GL_TEXTURE_2D, deinterlace_filter->prev_tex);
+ }
+
+ gl->ActiveTexture (GL_TEXTURE0);
+- gst_gl_shader_set_uniform_1i (deinterlace_filter->shader, "tex", 0);
++ gl->BindTexture (GL_TEXTURE_2D, texture);
+
+- gst_gl_shader_set_uniform_1f (deinterlace_filter->shader, "max_comb",
+- 5.0f / 255.0f);
+- gst_gl_shader_set_uniform_1f (deinterlace_filter->shader, "motion_threshold",
+- 25.0f / 255.0f);
+- gst_gl_shader_set_uniform_1f (deinterlace_filter->shader, "motion_sense",
+- 30.0f / 255.0f);
++ gst_gl_shader_set_uniform_1i (shader, "tex", 0);
++ gst_gl_shader_set_uniform_1f (shader, "max_comb", 5.0f / 255.0f);
++ gst_gl_shader_set_uniform_1f (shader, "motion_threshold", 25.0f / 255.0f);
++ gst_gl_shader_set_uniform_1f (shader, "motion_sense", 30.0f / 255.0f);
+
+- gst_gl_shader_set_uniform_1f (deinterlace_filter->shader, "width",
++ gst_gl_shader_set_uniform_1f (shader, "width",
+ GST_VIDEO_INFO_WIDTH (&filter->out_info));
+- gst_gl_shader_set_uniform_1f (deinterlace_filter->shader, "height",
++ gst_gl_shader_set_uniform_1f (shader, "height",
+ GST_VIDEO_INFO_HEIGHT (&filter->out_info));
+
+- gl->ClientActiveTexture (GL_TEXTURE0);
+-
+- gl->EnableClientState (GL_TEXTURE_COORD_ARRAY);
+- gl->EnableClientState (GL_VERTEX_ARRAY);
+-
+- gl->VertexPointer (2, GL_FLOAT, 0, &verts);
+- gl->TexCoordPointer (2, GL_FLOAT, 0, &texcoords0);
+-
+- gl->ClientActiveTexture (GL_TEXTURE1);
+- gl->EnableClientState (GL_TEXTURE_COORD_ARRAY);
+- gl->TexCoordPointer (2, GL_FLOAT, 0, &texcoords1);
+-
+- gl->DrawArrays (GL_TRIANGLE_FAN, 0, 4);
+-
+- gl->DisableClientState (GL_VERTEX_ARRAY);
+- gl->DisableClientState (GL_TEXTURE_COORD_ARRAY);
+-
+- gl->ClientActiveTexture (GL_TEXTURE0);
+- gl->DisableClientState (GL_TEXTURE_COORD_ARRAY);
++ gst_gl_filter_draw_texture (filter, texture, width, height);
+
+ if (texture == filter->in_tex_id) {
+ temp = filter->in_tex_id;
+diff --git a/ext/gl/gstgldeinterlace.h b/ext/gl/gstgldeinterlace.h
+index a81a2e7..58a9c0c 100644
+--- a/ext/gl/gstgldeinterlace.h
++++ b/ext/gl/gstgldeinterlace.h
+@@ -38,9 +38,13 @@ typedef struct _GstGLDeinterlaceClass GstGLDeinterlaceClass;
+ struct _GstGLDeinterlace
+ {
+ GstGLFilter filter;
+- GstGLShader *shader;
++
++ GLCB deinterlacefunc;
++ GHashTable *shaderstable;
+ GstBuffer *prev_buffer;
+ guint prev_tex;
++
++ gint current_method;
+ };
+
+ struct _GstGLDeinterlaceClass
+diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
+index 50676c4..135862a 100644
+--- a/ext/gl/gstopengl.c
++++ b/ext/gl/gstopengl.c
+@@ -62,6 +62,7 @@
+ #include "gstglstereosplit.h"
+ #include "gstglstereomix.h"
+ #include "gstglviewconvert.h"
++#include "gstgldeinterlace.h"
+
+ #if HAVE_GRAPHENE
+ #include "gstgltransformation.h"
+@@ -77,7 +78,6 @@
+ #include "gstgltestsrc.h"
+ #include "gstglfilterglass.h"
+ /* #include "gstglfilterreflectedscreen.h" */
+-#include "gstgldeinterlace.h"
+ #include "gstglmosaic.h"
+ #if HAVE_PNG
+ #include "gstgldifferencematte.h"
+@@ -226,6 +226,12 @@ plugin_init (GstPlugin * plugin)
+ GST_RANK_NONE, GST_TYPE_GL_STEREO_MIX)) {
+ return FALSE;
+ }
++
++ if (!gst_element_register (plugin, "gldeinterlace",
++ GST_RANK_NONE, GST_TYPE_GL_DEINTERLACE)) {
++ return FALSE;
++ }
++
+ #if HAVE_JPEG
+ #if HAVE_PNG
+ if (!gst_element_register (plugin, "gloverlay",
+@@ -250,11 +256,6 @@ plugin_init (GstPlugin * plugin)
+ return FALSE;
+ }
+ #endif
+- if (!gst_element_register (plugin, "gldeinterlace",
+- GST_RANK_NONE, GST_TYPE_GL_DEINTERLACE)) {
+- return FALSE;
+- }
+-
+ if (!gst_element_register (plugin, "glmosaic",
+ GST_RANK_NONE, GST_TYPE_GL_MOSAIC)) {
+ return FALSE;
+--
+1.9.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
index c7d67f8..7cd14c7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
@@ -12,6 +12,7 @@ SRC_URI = " \
file://avoid-including-sys-poll.h-directly.patch \
file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
+ file://0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch \
"
SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8"
SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [poky][PATCH 2/6] gstreamer1.0-plugins-bad: Implement multiple render targets for GLES3
2016-07-04 5:46 [poky][PATCH 0/6] Add patches for gstreamer1.0-plugins-bad V1.8.2 Yuqing Zhu
2016-07-04 5:46 ` [poky][PATCH 1/6] gstreamer1.0-plugins-bad: Enable gldeinterlace on OpenGL ES Yuqing Zhu
@ 2016-07-04 5:46 ` Yuqing Zhu
2016-07-04 5:46 ` [poky][PATCH 3/6] gstreamer1.0-plugins-bad: Don't use the predefined variable name in glcolorconvert Yuqing Zhu
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Yuqing Zhu @ 2016-07-04 5:46 UTC (permalink / raw)
To: openembedded-core; +Cc: Yuqing Zhu
There are numerous slight differences required between Desktop GL and GLES3 for
multiple render targets. Need to realize it.
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
---
...ert-implement-multiple-render-targets-for.patch | 244 +++++++++++++++++++++
.../gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb | 1 +
2 files changed, 245 insertions(+)
create mode 100755 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glcolorconvert-implement-multiple-render-targets-for.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glcolorconvert-implement-multiple-render-targets-for.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glcolorconvert-implement-multiple-render-targets-for.patch
new file mode 100755
index 0000000..31d8e05
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glcolorconvert-implement-multiple-render-targets-for.patch
@@ -0,0 +1,244 @@
+From 127e517568490fc147211d8b2fb4da01cecbbeb5 Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Thu, 31 Mar 2016 19:50:28 +1100
+Subject: [PATCH 5/6] glcolorconvert: implement multiple render targets for
+ GLES3
+
+There are numerous slight differences required between Desktop GL and GLES3 for
+multiple render targets.
+
+1. gl_FragData doesn't exist at all and one is required to use
+ 'layout (location = ?) out ...' instead.
+2. gl_FragColor doesn't exist, same as 1
+3. texture2D() has been deprecated
+
+Fortunately most of these have been taken care of with GL3 and the shader
+mangling already exists so just expand the conditions they are used in. The
+gl_FragData issue requires a new mangle pass though. We also use this new
+pass on desktop GL for consistency.
+
+Upstream-Status: Backport [1.9.1]
+
+---
+ gst-libs/gst/gl/gstglcolorconvert.c | 125 ++++++++++++++++++++++++++++--------
+ 1 file changed, 99 insertions(+), 26 deletions(-)
+
+diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c
+index 490ec54..f478faa 100644
+--- a/gst-libs/gst/gl/gstglcolorconvert.c
++++ b/gst-libs/gst/gl/gstglcolorconvert.c
+@@ -1802,10 +1802,11 @@ _mangle_sampler_type (const gchar * str, GstGLTextureTarget from,
+
+ static gchar *
+ _mangle_varying_attribute (const gchar * str, guint shader_type,
+- GstGLAPI gl_api)
++ GstGLAPI gl_api, guint gl_major, guint gl_minor)
+ {
+- if (gl_api & GST_GL_API_OPENGL3) {
+- if (shader_type == GL_VERTEX_SHADER) {
++ if (shader_type == GL_VERTEX_SHADER) {
++ if ((gl_api & GST_GL_API_OPENGL3) || (gl_api & GST_GL_API_GLES2
++ && gl_major >= 3)) {
+ gchar *tmp, *tmp2;
+ GRegex *regex;
+
+@@ -1821,7 +1822,10 @@ _mangle_varying_attribute (const gchar * str, guint shader_type,
+
+ g_free (tmp);
+ return tmp2;
+- } else if (shader_type == GL_FRAGMENT_SHADER) {
++ }
++ } else if (shader_type == GL_FRAGMENT_SHADER) {
++ if ((gl_api & GST_GL_API_OPENGL3) || (gl_api & GST_GL_API_GLES2
++ && gl_major > 3)) {
+ gchar *tmp;
+ GRegex *regex;
+
+@@ -1837,28 +1841,48 @@ _mangle_varying_attribute (const gchar * str, guint shader_type,
+ }
+
+ static gchar *
+-_mangle_frag_color (const gchar * str)
++_mangle_frag_color_data (const gchar * str)
+ {
+ GRegex *regex;
+- gchar *ret;
++ gchar *ret, *tmp;
+
+ regex = g_regex_new ("gl_FragColor", 0, 0, NULL);
+ ret = g_regex_replace_literal (regex, str, -1, 0, "fragColor", 0, NULL);
+ g_regex_unref (regex);
+
++ tmp = ret;
++ /* search and replace 'gl_FragData[NUM]' into fragColor_NUM */
++ regex = g_regex_new ("gl_FragData\\[(\\d+)\\]", 0, 0, NULL);
++ ret = g_regex_replace (regex, tmp, -1, 0, "fragColor_\\1", 0, NULL);
++ g_regex_unref (regex);
++ g_free (tmp);
++
+ return ret;
+ }
+
+ static void
+-_mangle_version_profile_from_gl_api (GstGLAPI gl_api, GstGLSLVersion * version,
+- GstGLSLProfile * profile)
++_mangle_version_profile_from_gl_api (GstGLAPI gl_api, gint gl_major,
++ gint gl_minor, GstGLSLVersion * version, GstGLSLProfile * profile)
+ {
++ *version = GST_GLSL_VERSION_NONE;
++ *profile = GST_GLSL_PROFILE_NONE;
++
+ if (gl_api & GST_GL_API_OPENGL3) {
+- *version = GST_GLSL_VERSION_150;
+- *profile = GST_GLSL_PROFILE_NONE;
++ if (gl_major > 3 || gl_minor >= 3) {
++ *version = GST_GLSL_VERSION_330;
++ *profile = GST_GLSL_PROFILE_CORE;
++ } else {
++ *version = GST_GLSL_VERSION_150;
++ *profile = GST_GLSL_PROFILE_NONE;
++ }
+ } else if (gl_api & GST_GL_API_GLES2) {
+- *version = GST_GLSL_VERSION_100;
+- *profile = GST_GLSL_PROFILE_ES;
++ if (gl_major >= 3) {
++ *version = GST_GLSL_VERSION_300;
++ *profile = GST_GLSL_PROFILE_ES;
++ } else if (gl_major >= 2) {
++ *version = GST_GLSL_VERSION_100;
++ *profile = GST_GLSL_PROFILE_ES;
++ }
+ } else if (gl_api & GST_GL_API_OPENGL) {
+ *version = GST_GLSL_VERSION_110;
+ *profile = GST_GLSL_PROFILE_COMPATIBILITY;
+@@ -1867,22 +1891,28 @@ _mangle_version_profile_from_gl_api (GstGLAPI gl_api, GstGLSLVersion * version,
+
+ static gchar *
+ _mangle_shader (const gchar * str, guint shader_type, GstGLTextureTarget from,
+- GstGLTextureTarget to, GstGLAPI gl_api, GstGLSLVersion * version,
+- GstGLSLProfile * profile)
++ GstGLTextureTarget to, GstGLAPI gl_api, gint gl_major, gint gl_minor,
++ GstGLSLVersion * version, GstGLSLProfile * profile)
+ {
+ gchar *tmp, *tmp2;
+
++ _mangle_version_profile_from_gl_api (gl_api, gl_major, gl_minor, version,
++ profile);
+ tmp = _mangle_texture_access (str, from, to, gl_api);
+ tmp2 = _mangle_sampler_type (tmp, from, to);
+ g_free (tmp);
+- tmp = _mangle_varying_attribute (tmp2, shader_type, gl_api);
++ tmp =
++ _mangle_varying_attribute (tmp2, shader_type, gl_api, gl_major, gl_minor);
+ g_free (tmp2);
+- if (shader_type == GL_FRAGMENT_SHADER && gl_api & GST_GL_API_OPENGL3) {
+- tmp2 = _mangle_frag_color (tmp);
+- g_free (tmp);
+- tmp = tmp2;
++ if (shader_type == GL_FRAGMENT_SHADER) {
++ if ((*profile == GST_GLSL_PROFILE_ES && *version >= GST_GLSL_VERSION_300)
++ || (*profile == GST_GLSL_PROFILE_CORE
++ && *version >= GST_GLSL_VERSION_150)) {
++ tmp2 = _mangle_frag_color_data (tmp);
++ g_free (tmp);
++ tmp = tmp2;
++ }
+ }
+- _mangle_version_profile_from_gl_api (gl_api, version, profile);
+ return tmp;
+ }
+
+@@ -1899,15 +1929,18 @@ _create_shader (GstGLColorConvert * convert)
+ const gchar *strings[2];
+ GError *error = NULL;
+ GstGLAPI gl_api;
++ gint gl_major, gl_minor;
+ int i;
+
+ gl_api = gst_gl_context_get_gl_api (convert->context);
++ gst_gl_context_get_gl_version (convert->context, &gl_major, &gl_minor);
+
+ ret = gst_gl_shader_new (convert->context);
+
+ tmp =
+ _mangle_shader (text_vertex_shader, GL_VERTEX_SHADER, info->templ->target,
+- convert->priv->from_texture_target, gl_api, &version, &profile);
++ convert->priv->from_texture_target, gl_api, gl_major, gl_minor, &version,
++ &profile);
+
+ tmp1 = gst_glsl_version_profile_to_string (version, profile);
+ version_str = g_strdup_printf ("#version %s\n", tmp1);
+@@ -1945,9 +1978,37 @@ _create_shader (GstGLColorConvert * convert)
+ if (info->templ->uniforms)
+ g_string_append (str, info->templ->uniforms);
+
+- if (gl_api & GST_GL_API_OPENGL3) {
+- g_string_append_c (str, '\n');
+- g_string_append (str, "out vec4 fragColor;\n");
++ g_string_append_c (str, '\n');
++
++ /* GL 3.3+ and GL ES 3.x */
++ if ((profile == GST_GLSL_PROFILE_CORE && version >= GST_GLSL_VERSION_330)
++ || (profile == GST_GLSL_PROFILE_ES && version >= GST_GLSL_VERSION_300)) {
++ if (info->out_n_textures > 1) {
++ gint i;
++
++ for (i = 0; i < info->out_n_textures; i++) {
++ g_string_append_printf (str,
++ "layout(location = %d) out vec4 fragColor_%d;\n", i, i);
++ }
++ } else {
++ g_string_append (str, "layout (location = 0) out vec4 fragColor;\n");
++ }
++ } else if (profile == GST_GLSL_PROFILE_CORE
++ && version >= GST_GLSL_VERSION_150) {
++ /* no layout specifiers, use glBindFragDataLocation instead */
++ if (info->out_n_textures > 1) {
++ gint i;
++
++ for (i = 0; i < info->out_n_textures; i++) {
++ gchar *var_name = g_strdup_printf ("fragColor_%d", i);
++ g_string_append_printf (str, "out vec4 %s;\n", var_name);
++ gst_gl_shader_bind_frag_data_location (ret, i, var_name);
++ g_free (var_name);
++ }
++ } else {
++ g_string_append (str, "out vec4 fragColor;\n");
++ gst_gl_shader_bind_frag_data_location (ret, 0, "fragColor");
++ }
+ }
+
+ for (i = 0; i < MAX_FUNCTIONS; i++) {
+@@ -1959,7 +2020,19 @@ _create_shader (GstGLColorConvert * convert)
+ g_string_append_c (str, '\n');
+ }
+
+- g_string_append (str, "\nvarying vec2 v_texcoord;\nvoid main (void) {\n");
++ {
++ const gchar *varying = NULL;
++
++ if ((profile == GST_GLSL_PROFILE_ES && version >= GST_GLSL_VERSION_300)
++ || (profile == GST_GLSL_PROFILE_CORE
++ && version >= GST_GLSL_VERSION_150)) {
++ varying = "in";
++ } else {
++ varying = "varying";
++ }
++ g_string_append_printf (str, "\n%s vec2 v_texcoord;\nvoid main (void) {\n",
++ varying);
++ }
+ if (info->frag_body) {
+ g_string_append (str, "vec2 texcoord;\n");
+ if (convert->priv->from_texture_target == GST_GL_TEXTURE_TARGET_RECTANGLE
+@@ -1975,7 +2048,7 @@ _create_shader (GstGLColorConvert * convert)
+ tmp = g_string_free (str, FALSE);
+ info->frag_prog = _mangle_shader (tmp, GL_FRAGMENT_SHADER,
+ info->templ->target, convert->priv->from_texture_target, gl_api,
+- &version, &profile);
++ gl_major, gl_minor, &version, &profile);
+ g_free (tmp);
+
+ strings[1] = info->frag_prog;
+--
+1.9.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
index 7cd14c7..0df1b8e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb
@@ -13,6 +13,7 @@ SRC_URI = " \
file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
file://0002-glplugin-enable-gldeinterlace-on-OpenGL-ES.patch \
+ file://0003-glcolorconvert-implement-multiple-render-targets-for.patch \
"
SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8"
SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread