summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Zidan <b50113@freescale.com>2014-07-22 14:49:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 21:59:14 +0100
commit036d9aba2090d12936758be4ff62165a69975cd6 (patch)
tree5c85db5deb184b91622b3837f0313814f4e5165f /meta
parentfd1aacc7983c79757be31cb3c21834a5dd047ecf (diff)
downloadpoky-036d9aba2090d12936758be4ff62165a69975cd6.tar.gz
gst-plugins-good: fix integer overrun for mulawdec
There might be more than 65535 samples in a chunk of data, so use 32 bit integer instead of 16 bit. (From OE-Core rev: 60de6e5d9d3dec482256ea4db8837204ca3ba628) Signed-off-by: Wang Zidan <b50113@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch47
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb7
2 files changed, 51 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
new file mode 100644
index 0000000000..48b8e98b81
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
@@ -0,0 +1,47 @@
1From ce94b2c2b91b6db190c121860e12a6afafce7ae1 Mon Sep 17 00:00:00 2001
2From: Roland Krikava <rkrikava@gmail.com>
3Date: Fri, 2 Nov 2012 12:38:44 -0400
4Subject: [PATCH 407/440] mulawdec: fix integer overrun
5
6There might be more than 65535 samples in a chunk of data.
7
8https://bugzilla.gnome.org/show_bug.cgi?id=687469
9
10Commit - 3be45f70220310ec1c60d819f90b5f2ae03b5d83 in 0.10 branch
11
12Upstream Status: Backported
13
14Signed-off-by: Roland Krikava <rkrikava@gmail.com>
15---
16 gst/law/mulaw-conversion.c | 6 ++++--
17 1 file changed, 4 insertions(+), 2 deletions(-)
18
19diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c
20index 8afae80..190a9f5 100644
21--- a/gst/law/mulaw-conversion.c
22+++ b/gst/law/mulaw-conversion.c
23@@ -51,9 +51,10 @@ mulaw_encode (gint16 * in, guint8 * out, gint numsamples)
24 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
25 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
26 };
27- gint16 sign, exponent, mantissa, i;
28+ gint16 sign, exponent, mantissa;
29 gint16 sample;
30 guint8 ulawbyte;
31+ gint i;
32
33 for (i = 0; i < numsamples; i++) {
34 sample = in[i];
35@@ -102,7 +103,8 @@ mulaw_decode (guint8 * in, gint16 * out, gint numsamples)
36 static gint16 exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 };
37 gint16 sign, exponent, mantissa;
38 guint8 ulawbyte;
39- gint16 linear, i;
40+ gint16 linear;
41+ gint i;
42
43 for (i = 0; i < numsamples; i++) {
44 ulawbyte = in[i];
45--
461.7.9.5
47
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index 88f90f3b85..4ccdec08ea 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -26,9 +26,10 @@ DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \
26 26
27inherit gettext gconf 27inherit gettext gconf
28 28
29SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" 29SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch \
30SRC_URI += "file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch" 30 file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch \
31 31 file://0407-mulawdec-fix-integer-overrun.patch \
32"
32EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal \ 33EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal \
33 --disable-examples --disable-taglib" 34 --disable-examples --disable-taglib"
34 35