diff mbox series

[FFmpeg-devel,v2] avcodec/libdav1d: export decoder frame delay

Message ID 20230516234129.1458-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel,v2] avcodec/libdav1d: export decoder frame delay | expand

Commit Message

James Almer May 16, 2023, 11:41 p.m. UTC 
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

Signed-off-by: James Almer <jamrial@gmail.com>
---
Now using the existing AVCodecContext field for this purpose instead of a
private field that needs to be accessed through the AVOption API.

 libavcodec/libdav1d.c | 9 +++++++++
 libavcodec/version.h  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
diff mbox series

Patch

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 da2264a097..2e28c23410 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@ 
 #include "version_major.h"
 
 #define LIBAVCODEC_VERSION_MINOR  12
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \