summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2017-08-11 23:36:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:03:14 +0100
commitae841c4371fc7f4ee08a9a2002738f52057aa6bb (patch)
treef517e15d5d5f7c36511d0f97f6819f535799224f /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch
parent71c2f1d0470aaf0402cf19a35b60ddae8e6b49fb (diff)
downloadpoky-ae841c4371fc7f4ee08a9a2002738f52057aa6bb.tar.gz
gstreamer1.0-plugins-bad: upgrade to version 1.12.2
* Remove backported patches: 1. 0001-smoothstreaming-implement-adaptivedemux-s-get_live_s.patch 2. 0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch 3. 0001-mssdemux-improved-live-playback-support.patch * Refreshed the following patches: 1. 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch Extended patch to include fix for libgstallocators 2. 0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch Updated to apply to 1.12.2 3. gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch Updated to apply to 1.12.2 * Removed license checks in tta directory as it doesn't exist anymore. * In 1.12.0, old unsupported plugins were removed. As a result, the list of unsupported plugins was removed. (From OE-Core rev: 1fa8492e54dd71ce7d4d853e0cb7295c28fa5e76) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch
deleted file mode 100644
index 4e51040863..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 0fbee8f37427b88339194b22ba9aa210772a8613 Mon Sep 17 00:00:00 2001
2From: Matthew Waters <matthew@centricular.com>
3Date: Thu, 10 Nov 2016 17:20:27 +1100
4Subject: [PATCH] smoothstreaming: use the duration from the list of fragments
5 if not present in the manifest
6
7Provides a more accurate duration for live streams that may be minutes
8or hours in front of the earliest fragment.
9
10https://bugzilla.gnome.org/show_bug.cgi?id=774178
11---
12Upstream-Status: Backport
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15 ext/smoothstreaming/gstmssmanifest.c | 24 ++++++++++++++++++++++++
16 1 file changed, 24 insertions(+)
17
18diff --git a/ext/smoothstreaming/gstmssmanifest.c b/ext/smoothstreaming/gstmssmanifest.c
19index 317b3cef9..144bbb42d 100644
20--- a/ext/smoothstreaming/gstmssmanifest.c
21+++ b/ext/smoothstreaming/gstmssmanifest.c
22@@ -888,6 +888,7 @@ gst_mss_manifest_get_duration (GstMssManifest * manifest)
23 gchar *duration;
24 guint64 dur = -1;
25
26+ /* try the property */
27 duration =
28 (gchar *) xmlGetProp (manifest->xmlrootnode,
29 (xmlChar *) MSS_PROP_STREAM_DURATION);
30@@ -895,6 +896,29 @@ gst_mss_manifest_get_duration (GstMssManifest * manifest)
31 dur = g_ascii_strtoull (duration, NULL, 10);
32 xmlFree (duration);
33 }
34+ /* else use the fragment list */
35+ if (dur <= 0) {
36+ guint64 max_dur = 0;
37+ GSList *iter;
38+
39+ for (iter = manifest->streams; iter; iter = g_slist_next (iter)) {
40+ GstMssStream *stream = iter->data;
41+
42+ if (stream->active) {
43+ if (stream->fragments) {
44+ GList *l = g_list_last (stream->fragments);
45+ GstMssStreamFragment *fragment = (GstMssStreamFragment *) l->data;
46+ guint64 frag_dur =
47+ fragment->time + fragment->duration * fragment->repetitions;
48+ max_dur = MAX (frag_dur, max_dur);
49+ }
50+ }
51+ }
52+
53+ if (max_dur != 0)
54+ dur = max_dur;
55+ }
56+
57 return dur;
58 }
59
60--
612.11.0
62