You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.9 KiB
48 lines
1.9 KiB
2 years ago
|
From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "U. Artie Eoff" <ullysses.a.eoff@intel.com>
|
||
|
|
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3964>
|
||
|
|
---
|
||
|
|
subprojects/gst-libav/ext/libav/gstavviddec.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/subprojects/gst-libav/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c
|
||
|
|
index 43cea456ae8..6d7c4cd0de8 100644
|
||
|
|
--- a/subprojects/gst-libav/ext/libav/gstavviddec.c
|
||
|
|
+++ b/subprojects/gst-libav/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
|
||
|
|
|