diff options
| author | James Almer <jamrial@gmail.com> | 2022-10-11 13:57:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-10-15 15:24:51 -0300 |
| commit | bd5b59deea2bd7e60a67b979cfe13ee355654baa (patch) | |
| tree | 075cf5da8f3b4a650bc59b71e099632f5d0a5c65 | |
| parent | d2fd0ea1d7feb31bea67a5143108b4ec64eb2287 (diff) | |
| download | ffmpeg-bd5b59deea2bd7e60a67b979cfe13ee355654baa.tar.gz | |
avcodec/libdav1d: add an option to set max frame delay
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/libdav1d.c | 11 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index e76f33d7e2..028929404e 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -50,6 +50,7 @@ typedef struct Libdav1dContext { Dav1dData data; int tile_threads; int frame_threads; + int max_frame_delay; int apply_grain; int operating_point; int all_layers; @@ -246,7 +247,9 @@ static av_cold int libdav1d_init(AVCodecContext *c) s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); else s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); - s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : 0; + if (dav1d->max_frame_delay > 0 && (c->flags & AV_CODEC_FLAG_LOW_DELAY)) + av_log(c, AV_LOG_WARNING, "Low delay mode requested, forcing max_frame_delay 1\n"); + s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : dav1d->max_frame_delay; av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", s.n_threads, s.max_frame_delay); #else @@ -256,6 +259,8 @@ static av_cold int libdav1d_init(AVCodecContext *c) s.n_frame_threads = dav1d->frame_threads ? dav1d->frame_threads : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + if (dav1d->max_frame_delay > 0) + s.n_frame_threads = FFMIN(s.n_frame_threads, dav1d->max_frame_delay); av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", s.n_frame_threads, s.n_tile_threads); #endif @@ -555,12 +560,16 @@ static av_cold int libdav1d_close(AVCodecContext *c) #ifndef DAV1D_MAX_TILE_THREADS #define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS #endif +#ifndef DAV1D_MAX_FRAME_DELAY +#define DAV1D_MAX_FRAME_DELAY DAV1D_MAX_FRAME_THREADS +#endif #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 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, + { "max_frame_delay", "Max frame delay", OFFSET(max_frame_delay), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_DELAY, VD }, { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD | AV_OPT_FLAG_DEPRECATED }, { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD }, { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, diff --git a/libavcodec/version.h b/libavcodec/version.h index ade18cddcd..2206401aa8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 50 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |