1 --- ffmpeg-4.4/libavcodec/libdav1d.c 2021-04-09 00:28:39.000000000 +0300
2 +++ ffmpeg-4.4/libavcodec/libdav1d.c 2022-03-27 15:54:53.212041349 +0300
7 +#define FF_DAV1D_VERSION_AT_LEAST(x,y) \
8 + (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y))
10 typedef struct Libdav1dContext {
14 if (dav1d->operating_point >= 0)
15 s.operating_point = dav1d->operating_point;
17 +#if FF_DAV1D_VERSION_AT_LEAST(6,0)
18 + if (dav1d->frame_threads || dav1d->tile_threads)
19 + s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads);
21 + s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS);
22 + s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads;
23 + av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n",
24 + s.n_threads, s.max_frame_delay);
26 s.n_tile_threads = dav1d->tile_threads
28 : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
30 : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
31 av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
32 s.n_frame_threads, s.n_tile_threads);
35 res = dav1d_open(&dav1d->c, &s);
38 Libdav1dContext *dav1d = c->priv_data;
39 Dav1dData *data = &dav1d->data;
40 Dav1dPicture pic = { 0 }, *p = &pic;
41 +#if FF_DAV1D_VERSION_AT_LEAST(5,1)
42 + enum Dav1dEventFlags event_flags = 0;
51 +#ifndef DAV1D_MAX_FRAME_THREADS
52 +#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS
54 +#ifndef DAV1D_MAX_TILE_THREADS
55 +#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS
58 #define OFFSET(x) offsetof(Libdav1dContext, x)
59 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
60 static const AVOption libdav1d_options[] = {
61 - { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD },
62 - { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD },
63 + { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED },
64 + { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED },
65 { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD | AV_OPT_FLAG_DEPRECATED },
66 { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD },
67 { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },