Patchwork gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux

login
register
mail settings
Submitter Wang Zidan
Date July 24, 2014, 5:53 a.m.
Message ID <1406181217-15706-1-git-send-email-b50113@freescale.com>
Download mbox | patch
Permalink /patch/76539/
State New
Headers show

Comments

Wang Zidan - July 24, 2014, 5:53 a.m.
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
Saul Wold - July 25, 2014, 8:07 p.m.
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"
>

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"