mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
b2a8cc4b05
commit
2eddd87e63
-62
@@ -1,62 +0,0 @@
|
||||
From c782a30482908a4b4dd9cd4abff9f9bc4016698f Mon Sep 17 00:00:00 2001
|
||||
From: Song Bing <b06498@freescale.com>
|
||||
Date: Tue, 5 Aug 2014 14:40:46 +0800
|
||||
Subject: [PATCH] gstrtpmp4gpay: set dafault value for MPEG4 without codec
|
||||
data in caps.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=734263
|
||||
|
||||
Upstream-Status: Submitted
|
||||
|
||||
Signed-off-by: Song Bing <b06498@freescale.com>
|
||||
---
|
||||
gst/rtp/gstrtpmp4gpay.c | 19 ++++++++++++++++++-
|
||||
1 file changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c
|
||||
index 7913d9a..1749d39 100644
|
||||
--- a/gst/rtp/gstrtpmp4gpay.c
|
||||
+++ b/gst/rtp/gstrtpmp4gpay.c
|
||||
@@ -391,6 +391,7 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
|
||||
const GValue *codec_data;
|
||||
const gchar *media_type = NULL;
|
||||
gboolean res;
|
||||
+ const gchar *name;
|
||||
|
||||
rtpmp4gpay = GST_RTP_MP4G_PAY (payload);
|
||||
|
||||
@@ -401,7 +402,6 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
|
||||
GST_LOG_OBJECT (rtpmp4gpay, "got codec_data");
|
||||
if (G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) {
|
||||
GstBuffer *buffer;
|
||||
- const gchar *name;
|
||||
|
||||
buffer = gst_value_get_buffer (codec_data);
|
||||
GST_LOG_OBJECT (rtpmp4gpay, "configuring codec_data");
|
||||
@@ -427,6 +427,23 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
|
||||
|
||||
rtpmp4gpay->config = gst_buffer_copy (buffer);
|
||||
}
|
||||
+ } else {
|
||||
+ name = gst_structure_get_name (structure);
|
||||
+
|
||||
+ if (!strcmp (name, "video/mpeg")) {
|
||||
+ rtpmp4gpay->profile = g_strdup ("1");
|
||||
+
|
||||
+ /* fixed rate */
|
||||
+ rtpmp4gpay->rate = 90000;
|
||||
+ /* video stream type */
|
||||
+ rtpmp4gpay->streamtype = "4";
|
||||
+ /* no params for video */
|
||||
+ rtpmp4gpay->params = NULL;
|
||||
+ /* mode */
|
||||
+ rtpmp4gpay->mode = "generic";
|
||||
+
|
||||
+ media_type = "video";
|
||||
+ }
|
||||
}
|
||||
if (media_type == NULL)
|
||||
goto config_failed;
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
From aadfa5f20f53601785e417fe3fcbe6d574880988 Mon Sep 17 00:00:00 2001
|
||||
From: Philippe Normand <philn@igalia.com>
|
||||
Date: Tue, 23 Apr 2019 10:10:01 +0100
|
||||
Subject: [PATCH] scaletempo: Advertise interleaved layout in caps templates
|
||||
|
||||
Scaletempo doesn't support non-interleaved layout. Not explicitely stating this
|
||||
would trigger critical warnings and a caps negotiation failure when scaletempo
|
||||
is used as playbin audio-filter.
|
||||
|
||||
Patch suggested by George Kiagiadakis <george.kiagiadakis@collabora.com>.
|
||||
|
||||
Fixes #591
|
||||
Upstream-Status: Backport [merged, on track for 1.16.1.]
|
||||
---
|
||||
gst/audiofx/gstscaletempo.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gst/audiofx/gstscaletempo.c b/gst/audiofx/gstscaletempo.c
|
||||
index 3a719719a..83ee8fe24 100644
|
||||
--- a/gst/audiofx/gstscaletempo.c
|
||||
+++ b/gst/audiofx/gstscaletempo.c
|
||||
@@ -93,9 +93,9 @@ enum
|
||||
|
||||
#define SUPPORTED_CAPS \
|
||||
GST_STATIC_CAPS ( \
|
||||
- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) "; " \
|
||||
- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) "; " \
|
||||
- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) \
|
||||
+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) ", layout=(string)interleaved; " \
|
||||
+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) ", layout=(string)interleaved; " \
|
||||
+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) ", layout=(string)interleaved" \
|
||||
)
|
||||
|
||||
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
--
|
||||
2.20.1
|
||||
|
||||
-44
@@ -1,44 +0,0 @@
|
||||
From 4bfe2c8570a4a7080ec662504882969054d8a072 Mon Sep 17 00:00:00 2001
|
||||
From: Andre McCurdy <armccurdy@gmail.com>
|
||||
Date: Wed, 3 Feb 2016 18:12:38 -0800
|
||||
Subject: [PATCH] avoid including <sys/poll.h> directly
|
||||
|
||||
musl libc generates warnings if <sys/poll.h> is included directly.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
||||
---
|
||||
ext/raw1394/gstdv1394src.c | 2 +-
|
||||
ext/raw1394/gsthdv1394src.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
|
||||
index dbc7607..3c42b41 100644
|
||||
--- a/ext/raw1394/gstdv1394src.c
|
||||
+++ b/ext/raw1394/gstdv1394src.c
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include <unistd.h>
|
||||
-#include <sys/poll.h>
|
||||
+#include <poll.h>
|
||||
#include <sys/socket.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
diff --git a/ext/raw1394/gsthdv1394src.c b/ext/raw1394/gsthdv1394src.c
|
||||
index 0b07a37..9785a15 100644
|
||||
--- a/ext/raw1394/gsthdv1394src.c
|
||||
+++ b/ext/raw1394/gsthdv1394src.c
|
||||
@@ -36,7 +36,7 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include <unistd.h>
|
||||
-#include <sys/poll.h>
|
||||
+#include <poll.h>
|
||||
#include <sys/socket.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
--
|
||||
1.9.1
|
||||
|
||||
-40
@@ -1,40 +0,0 @@
|
||||
From 2169f2205c0205a220d826d7573e5a863bd36e0a Mon Sep 17 00:00:00 2001
|
||||
From: Andre McCurdy <armccurdy@gmail.com>
|
||||
Date: Tue, 9 Feb 2016 14:00:00 -0800
|
||||
Subject: [PATCH] ensure valid sentinal for gst_structure_get()
|
||||
|
||||
gst_structure_get() is declared with G_GNUC_NULL_TERMINATED, ie
|
||||
__attribute__((__sentinel__)), which means gcc will generate a
|
||||
warning if the last parameter passed to the function is not NULL
|
||||
(where a valid NULL in this context is defined as zero with any
|
||||
pointer type).
|
||||
|
||||
The C code callers to gst_structure_get() within gst-plugins-good
|
||||
use the C NULL definition (ie ((void*)0)), which is a valid sentinel.
|
||||
|
||||
However gstid3v2mux.cc uses the C++ NULL definition (ie 0L), which
|
||||
is not a valid sentinel without an explicit cast to a pointer type.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
||||
---
|
||||
ext/taglib/gstid3v2mux.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ext/taglib/gstid3v2mux.cc b/ext/taglib/gstid3v2mux.cc
|
||||
index 8651e77..a87234f 100644
|
||||
--- a/ext/taglib/gstid3v2mux.cc
|
||||
+++ b/ext/taglib/gstid3v2mux.cc
|
||||
@@ -465,7 +465,7 @@ add_image_tag (ID3v2::Tag * id3v2tag, const GstTagList * list,
|
||||
|
||||
if (info_struct) {
|
||||
if (gst_structure_get (info_struct, "image-type",
|
||||
- GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) {
|
||||
+ GST_TYPE_TAG_IMAGE_TYPE, &image_type, (void *) NULL)) {
|
||||
if (image_type > 0 && image_type <= 18) {
|
||||
image_type += 2;
|
||||
} else {
|
||||
--
|
||||
1.9.1
|
||||
|
||||
+3
-5
@@ -2,14 +2,12 @@ require gstreamer1.0-plugins.inc
|
||||
|
||||
SRC_URI = " \
|
||||
http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
|
||||
file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \
|
||||
file://avoid-including-sys-poll.h-directly.patch \
|
||||
file://ensure-valid-sentinel-for-gst_structure_get.patch \
|
||||
file://0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch \
|
||||
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "6e3b247097366cf2639f22abfece7113"
|
||||
SRC_URI[sha256sum] = "5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979"
|
||||
SRC_URI[md5sum] = "d1a7b442994d9522418de4af4330e034"
|
||||
SRC_URI[sha256sum] = "654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd"
|
||||
|
||||
S = "${WORKDIR}/gst-plugins-good-${PV}"
|
||||
|
||||
Reference in New Issue
Block a user