summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-08-30 16:18:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:39 +0100
commit0d755c6b61d22839bacef38ea5b31d11c9fd0403 (patch)
tree7e21885a6876f76c929ddb367c10aa39174e61d0 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad
parentbc42617fff74ecf1442c20d9a71bed9c878c1800 (diff)
downloadpoky-0d755c6b61d22839bacef38ea5b31d11c9fd0403.tar.gz
gstreamer1.0: upgrade to 1.8.3
1.8.2 -> 1.8.3 Remove backported patch from 1.8.3: 0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch (From OE-Core rev: 0190736ef89447b81ab9a95e83ec205c5c1f4618) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad')
-rwxr-xr-xmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch46
1 files changed, 0 insertions, 46 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
deleted file mode 100755
index 90bfba990c..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-glplugin-gleffects-fix-little-rectangel-appears-at-t.patch
+++ /dev/null
@@ -1,46 +0,0 @@
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