diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-03-31 07:26:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-04-13 11:56:06 +0100 |
commit | 476c25f20089589880545e1fa51719d30bbc11d5 (patch) | |
tree | e0051f5f7139684050d58540a2f114214058d871 /meta/recipes-multimedia/gstreamer | |
parent | f79046d082f3a7752e6780b2990470dcd36cbba4 (diff) | |
download | poky-476c25f20089589880545e1fa51719d30bbc11d5.tar.gz |
ffmpeg: update 5.1.2 -> 6.0
Add a patch to gstreamer1.0-libav to address an API compatibility fail.
(From OE-Core rev: 2ebea6658458ca926af58b4904cecdbec7416e04)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch | 49 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb | 4 |
2 files changed, 52 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch new file mode 100644 index 0000000000..0a06540fb4 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001 | ||
2 | From: "U. Artie Eoff" <ullysses.a.eoff@intel.com> | ||
3 | Date: Mon, 13 Feb 2023 17:02:01 -0500 | ||
4 | Subject: [PATCH] avviddec: change | ||
5 | AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS | ||
6 | |||
7 | This fixes a compile error with recent upstream FFmpeg. | ||
8 | |||
9 | The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to | ||
10 | AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit | ||
11 | 7d09579190de (lavc 58.132.100). | ||
12 | |||
13 | The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream | ||
14 | commit 10c9a0874cb3 (lavc 59.63.100). | ||
15 | |||
16 | Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3964> | ||
17 | |||
18 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cde31d23c071ee93fae96331805f696856084254?merge_request_iid=3964] | ||
19 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
20 | --- | ||
21 | ext/libav/gstavviddec.c | 6 +++++- | ||
22 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c | ||
25 | index 43cea456ae8..6d7c4cd0de8 100644 | ||
26 | --- a/ext/libav/gstavviddec.c | ||
27 | +++ b/ext/libav/gstavviddec.c | ||
28 | @@ -35,6 +35,10 @@ | ||
29 | |||
30 | GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); | ||
31 | |||
32 | +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100) | ||
33 | +#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS | ||
34 | +#endif | ||
35 | + | ||
36 | #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15) | ||
37 | |||
38 | #define MAX_TS_MASK 0xff | ||
39 | @@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, | ||
40 | if (ffmpegdec->max_threads == 0) { | ||
41 | /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal | ||
42 | * to one frame per thread. We thus need to calculate the thread count ourselves */ | ||
43 | - if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) || | ||
44 | + if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) || | ||
45 | (ffmpegdec->context->thread_type & FF_THREAD_FRAME)) | ||
46 | ffmpegdec->context->thread_count = | ||
47 | MIN (gst_ffmpeg_auto_max_threads (), 16); | ||
48 | -- | ||
49 | GitLab | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb index 625a52ea55..d1dce6739d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb | |||
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ | |||
11 | file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ | 11 | file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" | 14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ |
15 | file://ffmpeg-6.0.patch \ | ||
16 | " | ||
15 | SRC_URI[sha256sum] = "0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" | 17 | SRC_URI[sha256sum] = "0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" |
16 | 18 | ||
17 | S = "${WORKDIR}/gst-libav-${PV}" | 19 | S = "${WORKDIR}/gst-libav-${PV}" |