[FFmpeg-cvslog] avcodec/libdav1d: pass auto threads value to libdav1d

James Almer git at videolan.org
Sat Nov 6 02:40:05 EET 2021


ffmpeg | branch: release/4.4 | James Almer <jamrial at gmail.com> | Mon Sep 20 22:30:35 2021 -0300| [61ed1182eeb2c38cba9cf09522423ad1ae70b413] | committer: James Almer

avcodec/libdav1d: pass auto threads value to libdav1d

libdav1d 1.0.0 will be the first version supporting Dav1dSettings.n_threads == 0.

Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit d873b5fffc8292242549c4c026023e370e15c05b)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61ed1182eeb2c38cba9cf09522423ad1ae70b413
---

 libavcodec/libdav1d.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index a9c983eaca..ac9214c830 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -127,7 +127,11 @@ static av_cold int libdav1d_init(AVCodecContext *c)
 {
     Libdav1dContext *dav1d = c->priv_data;
     Dav1dSettings s;
+#if FF_DAV1D_VERSION_AT_LEAST(6,0)
+    int threads = c->thread_count;
+#else
     int threads = (c->thread_count ? c->thread_count : av_cpu_count()) * 3 / 2;
+#endif
     int res;
 
     av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version());



More information about the ffmpeg-cvslog mailing list