summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorYuqing Zhu <carol.zhu@nxp.com>2016-07-04 13:46:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:45 +0100
commit648fd334da992d3d21a7cb13afa0e6c8e2152c7c (patch)
tree03c18b5f531306e99015ddad1b590b7a0d53f933 /meta/recipes-multimedia/gstreamer
parentc62fd7586617cbd29e58dd2c78bcfdbc72b0dc9b (diff)
downloadpoky-648fd334da992d3d21a7cb13afa0e6c8e2152c7c.tar.gz
gstreamer1.0-plugins-bad: Fix little rectangel appears at the center when use squeeze and tunnel effects
(From OE-Core rev: 061990f9aa97f2dac88e473b9852aed6f3f00f32) Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rwxr-xr-xmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch46
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.2.bb1
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch
new file mode 100755
index 0000000000..90bfba990c
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch
@@ -0,0 +1,46 @@
1From 43549773608b4f58dc664b7115a1ef0dcb32f251 Mon Sep 17 00:00:00 2001
2From: Haihua Hu <jared.hu@nxp.com>
3Date: Tue, 14 Jun 2016 13:48:09 +0800
4Subject: [PATCH 1/2] [glplugin]gleffects: fix little rectangel appears at the
5 center when use squeeze and tunnel effects
6
7These two shader will calculate the verctor length and use it as denominator.
8But length could be zero which will cause undefine behaviour. Add protection for
9this condition
10
11Upstream-Status: Backport [1.8.3]
12
13https://bugzilla.gnome.org/show_bug.cgi?id=767635
14
15Signed-off-by: Haihua Hu <jared.hu@nxp.com>
16---
17 ext/gl/effects/gstgleffectssources.c | 6 ++++--
18 1 file changed, 4 insertions(+), 2 deletions(-)
19
20diff --git a/ext/gl/effects/gstgleffectssources.c b/ext/gl/effects/gstgleffectssources.c
21index 6bdc155..3e87b8b 100644
22--- a/ext/gl/effects/gstgleffectssources.c
23+++ b/ext/gl/effects/gstgleffectssources.c
24@@ -100,7 +100,8 @@ const gchar *squeeze_fragment_source_gles2 =
25 "void main () {"
26 " vec2 texturecoord = v_texcoord.xy;"
27 " vec2 normcoord = texturecoord - 0.5;"
28- " float r = length (normcoord);"
29+ /* Add a very small value to length otherwise it could be 0 */
30+ " float r = length (normcoord)+0.01;"
31 " r = pow(r, 0.40)*1.3;"
32 " normcoord = normcoord / r;"
33 " texturecoord = (normcoord + 0.5);"
34@@ -136,7 +137,8 @@ const gchar *tunnel_fragment_source_gles2 =
35 * rect textures */
36 " normcoord = (texturecoord - 0.5);"
37 " float r = length(normcoord);"
38- " normcoord *= clamp (r, 0.0, 0.275) / r;"
39+ " if (r > 0.0)"
40+ " normcoord *= clamp (r, 0.0, 0.275) / r;"
41 " texturecoord = normcoord + 0.5;"
42 " gl_FragColor = texture2D (tex, texturecoord);"
43 "}";
44--
451.9.1
46
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 49b3677ddf..d0912b2a8c 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
@@ -17,6 +17,7 @@ SRC_URI = " \
17 file://0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch \ 17 file://0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch \
18 file://0005-glshader-add-glBindFragDataLocation.patch \ 18 file://0005-glshader-add-glBindFragDataLocation.patch \
19 file://0006-glcolorconvert-GLES3-deprecates-texture2D-and-it-doe.patch \ 19 file://0006-glcolorconvert-GLES3-deprecates-texture2D-and-it-doe.patch \
20 file://0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch \
20" 21"
21SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8" 22SRC_URI[md5sum] = "83abc2e70684e7b195f18ca2992ef6e8"
22SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97" 23SRC_URI[sha256sum] = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97"