From af8bc52e026897d379609cc51d33f628583dcfee Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 3 Aug 2023 10:16:20 -0700 Subject: gstreamer: Upgrade 1.20.3.imx -> 1.22.0.imx Note, this commit does also complete the 'snapshot' model being used by including the .inc files. Signed-off-by: Tom Hochstein --- ...ix-for-APNG-encoder-property-registration.patch | 86 ---------------------- .../gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch | 49 ++++++++++++ 2 files changed, 49 insertions(+), 86 deletions(-) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-libav') diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch deleted file mode 100644 index 526bbb003..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 78a97c1ec35ada76d83fc67d0549ba56c74d8875 Mon Sep 17 00:00:00 2001 -From: Seungha Yang -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 ---- - 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); diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch new file mode 100644 index 000000000..0a06540fb --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch @@ -0,0 +1,49 @@ +From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001 +From: "U. Artie Eoff" +Date: Mon, 13 Feb 2023 17:02:01 -0500 +Subject: [PATCH] avviddec: change + AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS + +This fixes a compile error with recent upstream FFmpeg. + +The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to +AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit +7d09579190de (lavc 58.132.100). + +The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream +commit 10c9a0874cb3 (lavc 59.63.100). + +Part-of: + +Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cde31d23c071ee93fae96331805f696856084254?merge_request_iid=3964] +Signed-off-by: Alexander Kanavin +--- + ext/libav/gstavviddec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index 43cea456ae8..6d7c4cd0de8 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -35,6 +35,10 @@ + + GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100) ++#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS ++#endif ++ + #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15) + + #define MAX_TS_MASK 0xff +@@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, + if (ffmpegdec->max_threads == 0) { + /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal + * to one frame per thread. We thus need to calculate the thread count ourselves */ +- if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) || ++ if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) || + (ffmpegdec->context->thread_type & FF_THREAD_FRAME)) + ffmpegdec->context->thread_count = + MIN (gst_ffmpeg_auto_max_threads (), 16); +-- +GitLab -- cgit v1.2.3-54-g00ecf