diff options
author | Wang Zidan <b50113@freescale.com> | 2014-07-22 14:49:24 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 21:59:15 +0100 |
commit | 2c4d82be3a95eefe65118b381efd552d3100a434 (patch) | |
tree | 6f2d71760fcca80eddad7e494d4fd2b50e00cb5d /meta/recipes-multimedia | |
parent | 5d7b5bb534d8d5b0d26b618f689713c3a3e78ee1 (diff) | |
download | poky-2c4d82be3a95eefe65118b381efd552d3100a434.tar.gz |
gstreamer1.0-plugins-base: get caps from src pad when query caps in gsttagdemux
(From OE-Core rev: b9a2aacfc0343d522cce9183dae15f1ae042b36d)
Signed-off-by: Wang Zidan <b50113@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch | 44 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb | 1 |
2 files changed, 45 insertions, 0 deletions
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 0000000000..0fc561c012 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001 | ||
2 | From: zhouming <b42586@freescale.com> | ||
3 | Date: Wed, 14 May 2014 10:16:20 +0800 | ||
4 | Subject: [PATCH] ENGR00312515: get caps from src pad when query caps | ||
5 | |||
6 | https://bugzilla.gnome.org/show_bug.cgi?id=728312 | ||
7 | |||
8 | Upstream Status: Pending | ||
9 | |||
10 | Signed-off-by: zhouming <b42586@freescale.com> | ||
11 | --- | ||
12 | gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ | ||
13 | 1 file changed, 13 insertions(+) | ||
14 | mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c | ||
15 | |||
16 | diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c | ||
17 | old mode 100644 | ||
18 | new mode 100755 | ||
19 | index 9b6c478..ae2294a | ||
20 | --- a/gst-libs/gst/tag/gsttagdemux.c | ||
21 | +++ b/gst-libs/gst/tag/gsttagdemux.c | ||
22 | @@ -1708,6 +1708,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) | ||
23 | } | ||
24 | break; | ||
25 | } | ||
26 | + case GST_QUERY_CAPS: | ||
27 | + { | ||
28 | + | ||
29 | + /* We can hijack caps query if we typefind already */ | ||
30 | + if (demux->priv->src_caps) { | ||
31 | + gst_query_set_caps_result (query, demux->priv->src_caps); | ||
32 | + res = TRUE; | ||
33 | + } else { | ||
34 | + res = gst_pad_query_default (pad, parent, query); | ||
35 | + } | ||
36 | + break; | ||
37 | + } | ||
38 | + | ||
39 | default: | ||
40 | res = gst_pad_query_default (pad, parent, query); | ||
41 | break; | ||
42 | -- | ||
43 | 1.7.9.5 | ||
44 | |||
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 6e3d8f9833..dee0894dc0 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 \ | |||
6 | " | 6 | " |
7 | 7 | ||
8 | SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \ | 8 | SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \ |
9 | file://get-caps-from-src-pad-when-query-caps.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | SRC_URI[md5sum] = "278e0a1872ecb981e91830b2cb7f3e98" | 12 | SRC_URI[md5sum] = "278e0a1872ecb981e91830b2cb7f3e98" |