From: James Almer <jamrial@gmail.com>
Date: Thu, 29 Nov 2018 01:48:13 +0000 (-0300)
Subject: avcodec/libdav1d: use constants defined in the public API to limit thread count
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/3cd275bcde5c0de509c239fff275e8277cece514

avcodec/libdav1d: use constants defined in the public API to limit thread count

Signed-off-by: James Almer <jamrial@gmail.com>
---

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index cfa0144..ed2262d 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -46,7 +46,7 @@ static av_cold int libdav1d_init(AVCodecContext *c)
 
     dav1d_default_settings(&s);
     s.n_tile_threads = dav1d->tile_threads;
-    s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), 256);
+    s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), DAV1D_MAX_FRAME_THREADS);
 
     res = dav1d_open(&dav1d->c, &s);
     if (res < 0)
@@ -223,7 +223,7 @@ static av_cold int libdav1d_close(AVCodecContext *c)
 #define OFFSET(x) offsetof(Libdav1dContext, x)
 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
 static const AVOption libdav1d_options[] = {
-    { "tilethreads",  "Tile threads",  OFFSET(tile_threads),  AV_OPT_TYPE_INT, { .i64 = 1 }, 1,  64, VD, NULL },
+    { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, DAV1D_MAX_TILE_THREADS, VD },
     { NULL }
 };