* [PATCH] gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux
@ 2014-07-24 5:53 Zidan Wang
2014-07-25 20:07 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Zidan Wang @ 2014-07-24 5:53 UTC (permalink / raw)
To: openembedded-core
From: Wang Zidan <b50113@freescale.com>
Signed-off-by: Wang Zidan <b50113@freescale.com>
---
.../get-caps-from-src-pad-when-query-caps.patch | 44 ++++++++++++++++++++
.../gstreamer/gstreamer1.0-plugins-base_1.2.4.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
new file mode 100644
index 0000000..0fc561c
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
@@ -0,0 +1,44 @@
+From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001
+From: zhouming <b42586@freescale.com>
+Date: Wed, 14 May 2014 10:16:20 +0800
+Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728312
+
+Upstream Status: Submitted
+
+Signed-off-by: zhouming <b42586@freescale.com>
+---
+ gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+ mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c
+
+diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
+old mode 100644
+new mode 100755
+index 9b6c478..ae2294a
+--- a/gst-libs/gst/tag/gsttagdemux.c
++++ b/gst-libs/gst/tag/gsttagdemux.c
+@@ -1708,6 +1708,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
+ }
+ break;
+ }
++ case GST_QUERY_CAPS:
++ {
++
++ /* We can hijack caps query if we typefind already */
++ if (demux->priv->src_caps) {
++ gst_query_set_caps_result (query, demux->priv->src_caps);
++ res = TRUE;
++ } else {
++ res = gst_pad_query_default (pad, parent, query);
++ }
++ break;
++ }
++
+ default:
+ res = gst_pad_query_default (pad, parent, query);
+ break;
+--
+1.7.9.5
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
index 6e3d8f9..dee0894 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
"
SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \
+ file://get-caps-from-src-pad-when-query-caps.patch \
"
SRC_URI[md5sum] = "278e0a1872ecb981e91830b2cb7f3e98"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux
2014-07-24 5:53 [PATCH] gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux Zidan Wang
@ 2014-07-25 20:07 ` Saul Wold
0 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2014-07-25 20:07 UTC (permalink / raw)
To: Zidan Wang, openembedded-core
On 07/23/2014 10:53 PM, Zidan Wang wrote:
> From: Wang Zidan <b50113@freescale.com>
>
This and your other patch need to be rebased against master please.
Sau!
> Signed-off-by: Wang Zidan <b50113@freescale.com>
> ---
> .../get-caps-from-src-pad-when-query-caps.patch | 44 ++++++++++++++++++++
> .../gstreamer/gstreamer1.0-plugins-base_1.2.4.bb | 1 +
> 2 files changed, 45 insertions(+)
> create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
>
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
> new file mode 100644
> index 0000000..0fc561c
> --- /dev/null
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
> @@ -0,0 +1,44 @@
> +From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001
> +From: zhouming <b42586@freescale.com>
> +Date: Wed, 14 May 2014 10:16:20 +0800
> +Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
> +
> +https://bugzilla.gnome.org/show_bug.cgi?id=728312
> +
> +Upstream Status: Submitted
> +
> +Signed-off-by: zhouming <b42586@freescale.com>
> +---
> + gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
> + 1 file changed, 13 insertions(+)
> + mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c
> +
> +diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
> +old mode 100644
> +new mode 100755
> +index 9b6c478..ae2294a
> +--- a/gst-libs/gst/tag/gsttagdemux.c
> ++++ b/gst-libs/gst/tag/gsttagdemux.c
> +@@ -1708,6 +1708,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
> + }
> + break;
> + }
> ++ case GST_QUERY_CAPS:
> ++ {
> ++
> ++ /* We can hijack caps query if we typefind already */
> ++ if (demux->priv->src_caps) {
> ++ gst_query_set_caps_result (query, demux->priv->src_caps);
> ++ res = TRUE;
> ++ } else {
> ++ res = gst_pad_query_default (pad, parent, query);
> ++ }
> ++ break;
> ++ }
> ++
> + default:
> + res = gst_pad_query_default (pad, parent, query);
> + break;
> +--
> +1.7.9.5
> +
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
> index 6e3d8f9..dee0894 100644
> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
> @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
> "
>
> SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \
> + file://get-caps-from-src-pad-when-query-caps.patch \
> "
>
> SRC_URI[md5sum] = "278e0a1872ecb981e91830b2cb7f3e98"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] gst-plugins-good: fix integer overrun for mulawdec
@ 2014-07-22 6:49 Wang Zidan
2014-07-22 6:49 ` [PATCH] gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux Wang Zidan
0 siblings, 1 reply; 4+ messages in thread
From: Wang Zidan @ 2014-07-22 6:49 UTC (permalink / raw)
To: openembedded-core
There might be more than 65535 samples in a chunk of data, so use
32 bit integer instead of 16 bit.
Signed-off-by: Wang Zidan <b50113@freescale.com>
---
.../0407-mulawdec-fix-integer-overrun.patch | 47 ++++++++++++++++++++
.../gstreamer/gst-plugins-good_0.10.31.bb | 7 +--
2 files changed, 51 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
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 0000000..48b8e98
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
@@ -0,0 +1,47 @@
+From ce94b2c2b91b6db190c121860e12a6afafce7ae1 Mon Sep 17 00:00:00 2001
+From: Roland Krikava <rkrikava@gmail.com>
+Date: Fri, 2 Nov 2012 12:38:44 -0400
+Subject: [PATCH 407/440] mulawdec: fix integer overrun
+
+There might be more than 65535 samples in a chunk of data.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687469
+
+Commit - 3be45f70220310ec1c60d819f90b5f2ae03b5d83 in 0.10 branch
+
+Upstream Status: Backported
+
+Signed-off-by: Roland Krikava <rkrikava@gmail.com>
+---
+ gst/law/mulaw-conversion.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c
+index 8afae80..190a9f5 100644
+--- a/gst/law/mulaw-conversion.c
++++ b/gst/law/mulaw-conversion.c
+@@ -51,9 +51,10 @@ mulaw_encode (gint16 * in, guint8 * out, gint numsamples)
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
+ };
+- gint16 sign, exponent, mantissa, i;
++ gint16 sign, exponent, mantissa;
+ gint16 sample;
+ guint8 ulawbyte;
++ gint i;
+
+ for (i = 0; i < numsamples; i++) {
+ sample = in[i];
+@@ -102,7 +103,8 @@ mulaw_decode (guint8 * in, gint16 * out, gint numsamples)
+ static gint16 exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 };
+ gint16 sign, exponent, mantissa;
+ guint8 ulawbyte;
+- gint16 linear, i;
++ gint16 linear;
++ gint i;
+
+ for (i = 0; i < numsamples; i++) {
+ ulawbyte = in[i];
+--
+1.7.9.5
+
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 88f90f3..4ccdec0 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 \
inherit gettext gconf
-SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
-SRC_URI += "file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch"
-
+SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch \
+ file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch \
+ file://0407-mulawdec-fix-integer-overrun.patch \
+"
EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal \
--disable-examples --disable-taglib"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux
2014-07-22 6:49 [PATCH] gst-plugins-good: fix integer overrun for mulawdec Wang Zidan
@ 2014-07-22 6:49 ` Wang Zidan
2014-07-22 22:26 ` Burton, Ross
0 siblings, 1 reply; 4+ messages in thread
From: Wang Zidan @ 2014-07-22 6:49 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Wang Zidan <b50113@freescale.com>
---
.../get-caps-from-src-pad-when-query-caps.patch | 44 ++++++++++++++++++++
.../gstreamer/gstreamer1.0-plugins-base_1.2.4.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
new file mode 100644
index 0000000..0fc561c
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
@@ -0,0 +1,44 @@
+From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001
+From: zhouming <b42586@freescale.com>
+Date: Wed, 14 May 2014 10:16:20 +0800
+Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728312
+
+Upstream Status: Pending
+
+Signed-off-by: zhouming <b42586@freescale.com>
+---
+ gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+ mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c
+
+diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
+old mode 100644
+new mode 100755
+index 9b6c478..ae2294a
+--- a/gst-libs/gst/tag/gsttagdemux.c
++++ b/gst-libs/gst/tag/gsttagdemux.c
+@@ -1708,6 +1708,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
+ }
+ break;
+ }
++ case GST_QUERY_CAPS:
++ {
++
++ /* We can hijack caps query if we typefind already */
++ if (demux->priv->src_caps) {
++ gst_query_set_caps_result (query, demux->priv->src_caps);
++ res = TRUE;
++ } else {
++ res = gst_pad_query_default (pad, parent, query);
++ }
++ break;
++ }
++
+ default:
+ res = gst_pad_query_default (pad, parent, query);
+ break;
+--
+1.7.9.5
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
index 6e3d8f9..dee0894 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
"
SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \
+ file://get-caps-from-src-pad-when-query-caps.patch \
"
SRC_URI[md5sum] = "278e0a1872ecb981e91830b2cb7f3e98"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-25 20:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-24 5:53 [PATCH] gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux Zidan Wang
2014-07-25 20:07 ` Saul Wold
-- strict thread matches above, loose matches on Subject: below --
2014-07-22 6:49 [PATCH] gst-plugins-good: fix integer overrun for mulawdec Wang Zidan
2014-07-22 6:49 ` [PATCH] gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux Wang Zidan
2014-07-22 22:26 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox