Accepting request 1203296 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/1203296 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gstreamer-plugins-base?expand=0&rev=108
This commit is contained in:
commit
d33d677cd2
@ -1,8 +1,8 @@
|
||||
Index: gst-plugins-base-1.24.5/tests/check/meson.build
|
||||
Index: gst-plugins-base-1.24.8/tests/check/meson.build
|
||||
===================================================================
|
||||
--- gst-plugins-base-1.24.5.orig/tests/check/meson.build
|
||||
+++ gst-plugins-base-1.24.5/tests/check/meson.build
|
||||
@@ -138,7 +138,7 @@ if build_gstgl
|
||||
--- gst-plugins-base-1.24.8.orig/tests/check/meson.build
|
||||
+++ gst-plugins-base-1.24.8/tests/check/meson.build
|
||||
@@ -133,7 +133,7 @@ if build_gstgl
|
||||
test_defines += ['-DTEST_GST_GL_ABI_CHECK']
|
||||
endif
|
||||
|
||||
|
BIN
gst-plugins-base-1.24.7.tar.xz
(Stored with Git LFS)
BIN
gst-plugins-base-1.24.7.tar.xz
(Stored with Git LFS)
Binary file not shown.
3
gst-plugins-base-1.24.8.tar.xz
Normal file
3
gst-plugins-base-1.24.8.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:10fb31743750ccd498d3933e8aaecda563ebc65596a6ab875b47ee936e4b9599
|
||||
size 2439740
|
@ -1,67 +0,0 @@
|
||||
From 378e78f285a3f14c0c53473948090464fa48147b Mon Sep 17 00:00:00 2001
|
||||
From: Edward Hervey <edward@centricular.com>
|
||||
Date: Wed, 21 Aug 2024 16:29:03 +0200
|
||||
Subject: [PATCH] decodebin3: Fix collection identity check
|
||||
|
||||
Collections can be auto-generated from upstream and yet have exactly the same
|
||||
streams in it.
|
||||
|
||||
Therefore do a more in-depth check for equality.
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3742
|
||||
---
|
||||
.../gst/playback/gstdecodebin3.c | 26 ++++++++++++++++++-
|
||||
1 file changed, 25 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst/playback/gstdecodebin3.c b/gst/playback/gstdecodebin3.c
|
||||
index 56ef496468ac..78b79c776ba6 100644
|
||||
--- a/gst/playback/gstdecodebin3.c
|
||||
+++ b/gst/playback/gstdecodebin3.c
|
||||
@@ -2609,6 +2609,29 @@ db_collection_new (GstStreamCollection * collection)
|
||||
return db_collection;
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
+collections_are_identical (GstStreamCollection * collection,
|
||||
+ GstStreamCollection * previous)
|
||||
+{
|
||||
+ guint i;
|
||||
+
|
||||
+ if (collection == previous)
|
||||
+ return TRUE;
|
||||
+
|
||||
+ if (gst_stream_collection_get_size (collection) !=
|
||||
+ gst_stream_collection_get_size (previous))
|
||||
+ return FALSE;
|
||||
+
|
||||
+ for (i = 0; i < gst_stream_collection_get_size (previous); i++) {
|
||||
+ GstStream *stream = gst_stream_collection_get_stream (previous, i);
|
||||
+ const gchar *sid = gst_stream_get_stream_id (stream);
|
||||
+ if (!stream_in_collection (collection, (gchar *) sid))
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
/** handle_stream_collection_locked:
|
||||
* @dbin:
|
||||
* @collection: (transfer none): The new collection for @input. Can be %NULL.
|
||||
@@ -2683,12 +2706,13 @@ handle_stream_collection_locked (GstDecodebin3 * dbin,
|
||||
if (dbin->input_collection) {
|
||||
GstStreamCollection *previous = dbin->input_collection->collection;
|
||||
|
||||
- if (collection == previous) {
|
||||
+ if (collections_are_identical (collection, previous)) {
|
||||
GST_DEBUG_OBJECT (dbin, "Collection didn't change");
|
||||
gst_object_unref (collection);
|
||||
SELECTION_UNLOCK (dbin);
|
||||
return NULL;
|
||||
}
|
||||
+
|
||||
/* Check if this collection is an update of the previous one */
|
||||
if (gst_stream_collection_get_size (collection) >
|
||||
gst_stream_collection_get_size (previous)) {
|
||||
--
|
||||
GitLab
|
||||
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 23 13:08:20 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 1.24.8:
|
||||
+ decodebin3: Fix collection identity check
|
||||
+ encodebin: Fix pad removal
|
||||
+ glimagesink: Fix cannot resize viewport when video size changed
|
||||
in caps
|
||||
+ video: Don't overshoot QoS earliest time by a factor of 2
|
||||
+ meson: gst-play: link to libm
|
||||
- Drop gst-plugins-base-decodebin3-collection-identity-check.patch:
|
||||
Fixed upstream.
|
||||
- Rebase add_wayland_dep_to_tests.patch with quilt.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 23 07:15:20 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
%define gst_branch 1.0
|
||||
%define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
|
||||
Name: gstreamer-plugins-base
|
||||
Version: 1.24.7
|
||||
Version: 1.24.8
|
||||
Release: 0
|
||||
Summary: GStreamer Streaming-Media Framework Plug-Ins
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@ -31,7 +31,6 @@ Source1: gstreamer-plugins-base.appdata.xml
|
||||
Source2: baselibs.conf
|
||||
Patch1: add_wayland_dep_to_tests.patch
|
||||
Patch2: MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
|
||||
Patch3: gst-plugins-base-decodebin3-collection-identity-check.patch
|
||||
|
||||
BuildRequires: Mesa-libGLESv3-devel
|
||||
BuildRequires: cdparanoia-devel
|
||||
|
Loading…
x
Reference in New Issue
Block a user