mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 09:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer1.0-libav: fix errors with ffmpeg 5.x

Browse Source 
Backport of patch already present upstream to fix issues with invalid
characters for GLIB when combining gstreamer1.0-libav with ffmpeg 5.x.

Remove when gstreamer1.0-libav is upgraded to 1.21.1 or above

(From OE-Core rev: 703ff945557ad307bbe4ba0b0b7f1a2e5b4b847e)

Signed-off-by: Claus Stovgaard <claus.stovgaard@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Claus Stovgaard
2022-10-22 14:59:34 +02:00
committed by Richard Purdie
parent b3ffb247c7
commit c43df5b5cc
2 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch Normal file
View File

@@ -0,0 +1,86 @@
From 78a97c1ec35ada76d83fc67d0549ba56c74d8875 Mon Sep 17 00:00:00 2001
From: Seungha Yang <seungha@centricular.com>
Date: Thu, 7 Jul 2022 22:16:30 +0900
Subject: [PATCH] libav: Fix for APNG encoder property registration
The AVClass name of Animated PNG in FFmpeg 5.x is "(A)PNG"
and it will be converted to "-a-png" through
g_ascii_strdown() and g_strcanon(). But GLib disallow leading '-'
character for a GType name. Strip leading '-' to workaround it.
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2724]
Seungha Yangs patch was imported without modifications.
Signed-off-by: Claus Stovgaard <claus.stovgaard@gmail.com>
---
ext/libav/gstavcfg.c | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c
index c736920..a8635a7 100644
--- a/ext/libav/gstavcfg.c
+++ b/ext/libav/gstavcfg.c
@@ -91,10 +91,19 @@ register_enum (const AVClass ** obj, const AVOption * top_opt)
gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1);
gchar *enum_name = g_strdup_printf ("%s-%s", lower_obj_name, top_opt->unit);
gboolean none_default = TRUE;
+ const gchar *enum_name_strip;
g_strcanon (enum_name, G_CSET_a_2_z G_CSET_DIGITS, '-');
- if ((res = g_type_from_name (enum_name)))
+ /* strip leading '-'s */
+ enum_name_strip = enum_name;
+ while (enum_name_strip[0] == '-')
+ enum_name_strip++;
+
+ if (enum_name_strip[0] == '\0')
+ goto done;
+
+ if ((res = g_type_from_name (enum_name_strip)))
goto done;
while ((opt = av_opt_next (obj, opt))) {
@@ -150,9 +159,8 @@ register_enum (const AVClass ** obj, const AVOption * top_opt)
}
}
- res =
- g_enum_register_static (enum_name, &g_array_index (values, GEnumValue,
- 0));
+ res = g_enum_register_static (enum_name_strip,
+ &g_array_index (values, GEnumValue, 0));
gst_type_mark_as_plugin_api (res, 0);
}
@@ -177,10 +185,19 @@ register_flags (const AVClass ** obj, const AVOption * top_opt)
GArray *values = g_array_new (TRUE, TRUE, sizeof (GEnumValue));
gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1);
gchar *flags_name = g_strdup_printf ("%s-%s", lower_obj_name, top_opt->unit);
+ const gchar *flags_name_strip;
g_strcanon (flags_name, G_CSET_a_2_z G_CSET_DIGITS, '-');
- if ((res = g_type_from_name (flags_name)))
+ /* strip leading '-'s */
+ flags_name_strip = flags_name;
+ while (flags_name_strip[0] == '-')
+ flags_name_strip++;
+
+ if (flags_name_strip[0] == '\0')
+ goto done;
+
+ if ((res = g_type_from_name (flags_name_strip)))
goto done;
while ((opt = av_opt_next (obj, opt))) {
@@ -211,7 +228,7 @@ register_flags (const AVClass ** obj, const AVOption * top_opt)
g_array_sort (values, (GCompareFunc) cmp_flags_value);
res =
- g_flags_register_static (flags_name, &g_array_index (values,
+ g_flags_register_static (flags_name_strip, &g_array_index (values,
GFlagsValue, 0));
gst_type_mark_as_plugin_api (res, 0);

4
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.3.bb
View File

@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
"
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
file://0001-libav-Fix-for-APNG-encoder-property-registration.patch \
"
SRC_URI[sha256sum] = "3fedd10560fcdfaa1b6462cbf79a38c4e7b57d7f390359393fc0cef6dbf27dfe"
S = "${WORKDIR}/gst-libav-${PV}"