diff options
| author | James Almer <jamrial@gmail.com> | 2023-05-16 20:37:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-05-19 15:29:31 -0300 |
| commit | 1b05d27346130599ea188c35f97790d95db1d55f (patch) | |
| tree | 251430e308a3b0427e1bdfad743b4a554564eca9 /libavcodec | |
| parent | 613f7164501ef6cb4a45e969477946dfa5fa1b00 (diff) | |
| download | ffmpeg-1b05d27346130599ea188c35f97790d95db1d55f.tar.gz | |
avcodec/libdav1d: export decoder frame delay
As this is an AV_CODEC_CAP_OTHER_THREADS decoder, threading is handled by the
underlying library. In this case, the frame delay is calculated by libdav1d
based on the values from avctx->thread_count and the private max_frame_delay
option.
Export said delay reported by the library in AVCodecContext.delay
Reviewed-by: Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libdav1d.c | 9 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 4c48f0099a..c15e98cbd1 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -276,6 +276,15 @@ static av_cold int libdav1d_init(AVCodecContext *c) if (res < 0) return AVERROR(ENOMEM); +#if FF_DAV1D_VERSION_AT_LEAST(6,7) + res = dav1d_get_frame_delay(&s); + if (res < 0) // Should not happen + return AVERROR_EXTERNAL; + + // When dav1d_get_frame_delay() returns 1, there's no delay whatsoever + c->delay = res > 1 ? res : 0; +#endif + return 0; } diff --git a/libavcodec/version.h b/libavcodec/version.h index 7531c6c42a..c20072197d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 14 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |