diff options
author | Carlos Rafael Giani <crg7475@mailbox.org> | 2019-05-26 13:06:34 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-28 10:47:02 +0100 |
commit | 2eddd87e63074341b81834e7a07e82265b462255 (patch) | |
tree | 6af65e566bdb2507f26b5575d0febcdcb2550220 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good | |
parent | b2a8cc4b0583689a4c5d5374beb638f2a74e8bf0 (diff) | |
download | poky-2eddd87e63074341b81834e7a07e82265b462255.tar.gz |
gstreamer1.0-plugins-good: upgrade to version 1.16.0
* 0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch
Added this patch that is on track for version 1.16.1 because
it is needed for WebKit
* 0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
Removed since it is not needed (using mpeg4videoparse fixes the issue)
* avoid-including-sys-poll.h-directly.patch
* ensure-valid-sentinel-for-gst_structure_get.patch
Removed since these are included in 1.16.0
(From OE-Core rev: 2af6b5500f719eb4128e27e8346be9d9c3e1377e)
Signed-off-by: Philippe Normand <philn@igalia.com>
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good')
4 files changed, 37 insertions, 146 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch deleted file mode 100644 index a2cbb70fe9..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From c782a30482908a4b4dd9cd4abff9f9bc4016698f Mon Sep 17 00:00:00 2001 | ||
2 | From: Song Bing <b06498@freescale.com> | ||
3 | Date: Tue, 5 Aug 2014 14:40:46 +0800 | ||
4 | Subject: [PATCH] gstrtpmp4gpay: set dafault value for MPEG4 without codec | ||
5 | data in caps. | ||
6 | |||
7 | https://bugzilla.gnome.org/show_bug.cgi?id=734263 | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | |||
11 | Signed-off-by: Song Bing <b06498@freescale.com> | ||
12 | --- | ||
13 | gst/rtp/gstrtpmp4gpay.c | 19 ++++++++++++++++++- | ||
14 | 1 file changed, 18 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c | ||
17 | index 7913d9a..1749d39 100644 | ||
18 | --- a/gst/rtp/gstrtpmp4gpay.c | ||
19 | +++ b/gst/rtp/gstrtpmp4gpay.c | ||
20 | @@ -391,6 +391,7 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) | ||
21 | const GValue *codec_data; | ||
22 | const gchar *media_type = NULL; | ||
23 | gboolean res; | ||
24 | + const gchar *name; | ||
25 | |||
26 | rtpmp4gpay = GST_RTP_MP4G_PAY (payload); | ||
27 | |||
28 | @@ -401,7 +402,6 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) | ||
29 | GST_LOG_OBJECT (rtpmp4gpay, "got codec_data"); | ||
30 | if (G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) { | ||
31 | GstBuffer *buffer; | ||
32 | - const gchar *name; | ||
33 | |||
34 | buffer = gst_value_get_buffer (codec_data); | ||
35 | GST_LOG_OBJECT (rtpmp4gpay, "configuring codec_data"); | ||
36 | @@ -427,6 +427,23 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) | ||
37 | |||
38 | rtpmp4gpay->config = gst_buffer_copy (buffer); | ||
39 | } | ||
40 | + } else { | ||
41 | + name = gst_structure_get_name (structure); | ||
42 | + | ||
43 | + if (!strcmp (name, "video/mpeg")) { | ||
44 | + rtpmp4gpay->profile = g_strdup ("1"); | ||
45 | + | ||
46 | + /* fixed rate */ | ||
47 | + rtpmp4gpay->rate = 90000; | ||
48 | + /* video stream type */ | ||
49 | + rtpmp4gpay->streamtype = "4"; | ||
50 | + /* no params for video */ | ||
51 | + rtpmp4gpay->params = NULL; | ||
52 | + /* mode */ | ||
53 | + rtpmp4gpay->mode = "generic"; | ||
54 | + | ||
55 | + media_type = "video"; | ||
56 | + } | ||
57 | } | ||
58 | if (media_type == NULL) | ||
59 | goto config_failed; | ||
60 | -- | ||
61 | 1.7.9.5 | ||
62 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch new file mode 100644 index 0000000000..caa080c8e7 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From aadfa5f20f53601785e417fe3fcbe6d574880988 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philippe Normand <philn@igalia.com> | ||
3 | Date: Tue, 23 Apr 2019 10:10:01 +0100 | ||
4 | Subject: [PATCH] scaletempo: Advertise interleaved layout in caps templates | ||
5 | |||
6 | Scaletempo doesn't support non-interleaved layout. Not explicitely stating this | ||
7 | would trigger critical warnings and a caps negotiation failure when scaletempo | ||
8 | is used as playbin audio-filter. | ||
9 | |||
10 | Patch suggested by George Kiagiadakis <george.kiagiadakis@collabora.com>. | ||
11 | |||
12 | Fixes #591 | ||
13 | Upstream-Status: Backport [merged, on track for 1.16.1.] | ||
14 | --- | ||
15 | gst/audiofx/gstscaletempo.c | 6 +++--- | ||
16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/gst/audiofx/gstscaletempo.c b/gst/audiofx/gstscaletempo.c | ||
19 | index 3a719719a..83ee8fe24 100644 | ||
20 | --- a/gst/audiofx/gstscaletempo.c | ||
21 | +++ b/gst/audiofx/gstscaletempo.c | ||
22 | @@ -93,9 +93,9 @@ enum | ||
23 | |||
24 | #define SUPPORTED_CAPS \ | ||
25 | GST_STATIC_CAPS ( \ | ||
26 | - GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) "; " \ | ||
27 | - GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) "; " \ | ||
28 | - GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) \ | ||
29 | + GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) ", layout=(string)interleaved; " \ | ||
30 | + GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) ", layout=(string)interleaved; " \ | ||
31 | + GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) ", layout=(string)interleaved" \ | ||
32 | ) | ||
33 | |||
34 | static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", | ||
35 | -- | ||
36 | 2.20.1 | ||
37 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch deleted file mode 100644 index c7f3630eca..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 4bfe2c8570a4a7080ec662504882969054d8a072 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Wed, 3 Feb 2016 18:12:38 -0800 | ||
4 | Subject: [PATCH] avoid including <sys/poll.h> directly | ||
5 | |||
6 | musl libc generates warnings if <sys/poll.h> is included directly. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
11 | --- | ||
12 | ext/raw1394/gstdv1394src.c | 2 +- | ||
13 | ext/raw1394/gsthdv1394src.c | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c | ||
17 | index dbc7607..3c42b41 100644 | ||
18 | --- a/ext/raw1394/gstdv1394src.c | ||
19 | +++ b/ext/raw1394/gstdv1394src.c | ||
20 | @@ -37,7 +37,7 @@ | ||
21 | #include "config.h" | ||
22 | #endif | ||
23 | #include <unistd.h> | ||
24 | -#include <sys/poll.h> | ||
25 | +#include <poll.h> | ||
26 | #include <sys/socket.h> | ||
27 | #include <errno.h> | ||
28 | #include <fcntl.h> | ||
29 | diff --git a/ext/raw1394/gsthdv1394src.c b/ext/raw1394/gsthdv1394src.c | ||
30 | index 0b07a37..9785a15 100644 | ||
31 | --- a/ext/raw1394/gsthdv1394src.c | ||
32 | +++ b/ext/raw1394/gsthdv1394src.c | ||
33 | @@ -36,7 +36,7 @@ | ||
34 | #include "config.h" | ||
35 | #endif | ||
36 | #include <unistd.h> | ||
37 | -#include <sys/poll.h> | ||
38 | +#include <poll.h> | ||
39 | #include <sys/socket.h> | ||
40 | #include <errno.h> | ||
41 | #include <fcntl.h> | ||
42 | -- | ||
43 | 1.9.1 | ||
44 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch deleted file mode 100644 index bc7ac0b6a1..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 2169f2205c0205a220d826d7573e5a863bd36e0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Tue, 9 Feb 2016 14:00:00 -0800 | ||
4 | Subject: [PATCH] ensure valid sentinal for gst_structure_get() | ||
5 | |||
6 | gst_structure_get() is declared with G_GNUC_NULL_TERMINATED, ie | ||
7 | __attribute__((__sentinel__)), which means gcc will generate a | ||
8 | warning if the last parameter passed to the function is not NULL | ||
9 | (where a valid NULL in this context is defined as zero with any | ||
10 | pointer type). | ||
11 | |||
12 | The C code callers to gst_structure_get() within gst-plugins-good | ||
13 | use the C NULL definition (ie ((void*)0)), which is a valid sentinel. | ||
14 | |||
15 | However gstid3v2mux.cc uses the C++ NULL definition (ie 0L), which | ||
16 | is not a valid sentinel without an explicit cast to a pointer type. | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | |||
20 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
21 | --- | ||
22 | ext/taglib/gstid3v2mux.cc | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/ext/taglib/gstid3v2mux.cc b/ext/taglib/gstid3v2mux.cc | ||
26 | index 8651e77..a87234f 100644 | ||
27 | --- a/ext/taglib/gstid3v2mux.cc | ||
28 | +++ b/ext/taglib/gstid3v2mux.cc | ||
29 | @@ -465,7 +465,7 @@ add_image_tag (ID3v2::Tag * id3v2tag, const GstTagList * list, | ||
30 | |||
31 | if (info_struct) { | ||
32 | if (gst_structure_get (info_struct, "image-type", | ||
33 | - GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) { | ||
34 | + GST_TYPE_TAG_IMAGE_TYPE, &image_type, (void *) NULL)) { | ||
35 | if (image_type > 0 && image_type <= 18) { | ||
36 | image_type += 2; | ||
37 | } else { | ||
38 | -- | ||
39 | 1.9.1 | ||
40 | |||