summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Zidan <b50113@freescale.com>2014-07-22 14:49:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 21:59:14 +0100
commit5d7b5bb534d8d5b0d26b618f689713c3a3e78ee1 (patch)
treee47d15bd624edaea8b29f7aedd8748d991d89894 /meta
parent8040b2df22a1a9ad010462c099d5252b96ab3071 (diff)
downloadpoky-5d7b5bb534d8d5b0d26b618f689713c3a3e78ee1.tar.gz
gstreamer1.0-plugins-base: do not change eos event to gap event if no data has passed to streamsynchronizer.
(From OE-Core rev: 8b85075e592e867e7ffba919b10fca150f6a62b0) 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/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch37
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.4.bb4
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch
new file mode 100644
index 0000000000..0407a30f90
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/do-not-change-eos-event-to-gap-event-if.patch
@@ -0,0 +1,37 @@
1From b608d027fff6efc2d1988ebf169cbe3b2b44a61b Mon Sep 17 00:00:00 2001
2From: zhouming <b42586@freescale.com>
3Date: Thu, 8 May 2014 12:01:17 +0800
4Subject: [PATCH] ENGR00312034: do not change eos event to gap event if no
5 data has passed to streamsynchronizer.
6
7https://bugzilla.gnome.org/show_bug.cgi?id=727074
8
9Upstream Status: Pending
10
11Signed-off-by: zhouming <b42586@freescale.com>
12---
13 gst/playback/gststreamsynchronizer.c | 5 ++---
14 1 file changed, 2 insertions(+), 3 deletions(-)
15
16diff --git a/gst/playback/gststreamsynchronizer.c b/gst/playback/gststreamsynchronizer.c
17index 3997d1b..3e17c55 100644
18--- a/gst/playback/gststreamsynchronizer.c
19+++ b/gst/playback/gststreamsynchronizer.c
20@@ -488,12 +488,11 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstObject * parent,
21 }
22 g_slist_free (pads);
23 } else {
24- /* if EOS, but no data has passed, then send something to replace EOS
25- * for preroll purposes */
26+ /* if EOS, but no data has passed, then send EOS event */
27 if (!seen_data) {
28 GstEvent *gap_event;
29
30- gap_event = gst_event_new_gap (timestamp, GST_CLOCK_TIME_NONE);
31+ gap_event = gst_event_new_eos ();
32 ret = gst_pad_push_event (srcpad, gap_event);
33 } else {
34 GstEvent *gap_event;
35--
361.7.9.5
37
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 ed8babe2a0..6e3d8f9833 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
@@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ 4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
5 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ 5 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
6 " 6 "
7
8SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \
9"
10
7SRC_URI[md5sum] = "278e0a1872ecb981e91830b2cb7f3e98" 11SRC_URI[md5sum] = "278e0a1872ecb981e91830b2cb7f3e98"
8SRC_URI[sha256sum] = "4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550" 12SRC_URI[sha256sum] = "4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550"
9S = "${WORKDIR}/gst-plugins-base-${PV}" 13S = "${WORKDIR}/gst-plugins-base-${PV}"