diff mbox series

[FFmpeg-devel] avcodec/libdav1d: only return EAGAIN when there are no buffered packets

Message ID 20230520172312.2384-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel] avcodec/libdav1d: only return EAGAIN when there are no buffered packets | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer May 20, 2023, 5:23 p.m. UTC 
Fixes decoding packets containing split temporal units, as generated for example
by the av1_frame_split bsf.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/libdav1d.c | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

Comments

James Almer May 22, 2023, 5:18 p.m. UTC | #1 
On 5/20/2023 2:23 PM, James Almer wrote:
> Fixes decoding packets containing split temporal units, as generated for example
> by the av1_frame_split bsf.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>   libavcodec/libdav1d.c | 39 ++++++++++++++++++++++++++++-----------
>   1 file changed, 28 insertions(+), 11 deletions(-)

Will apply.
diff mbox series

Patch

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index c15e98cbd1..f72ecf3d8a 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -316,20 +316,14 @@  static void libdav1d_user_data_free(const uint8_t *data, void *opaque) {
     av_packet_free(&pkt);
 }
 
-static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
+static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p)
 {
     Libdav1dContext *dav1d = c->priv_data;
     Dav1dData *data = &dav1d->data;
-    Dav1dPicture pic = { 0 }, *p = &pic;
-    AVPacket *pkt;
-    OpaqueData *od = NULL;
-#if FF_DAV1D_VERSION_AT_LEAST(5,1)
-    enum Dav1dEventFlags event_flags = 0;
-#endif
     int res;
 
     if (!data->sz) {
-        pkt = av_packet_alloc();
+        AVPacket *pkt = av_packet_alloc();
 
         if (!pkt)
             return AVERROR(ENOMEM);
@@ -341,6 +335,8 @@  static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
         }
 
         if (pkt->size) {
+            OpaqueData *od = NULL;
+
             res = dav1d_data_wrap(data, pkt->data, pkt->size,
                                   libdav1d_data_free, pkt->buf);
             if (res < 0) {
@@ -400,12 +396,33 @@  FF_ENABLE_DEPRECATION_WARNINGS
     if (res < 0) {
         if (res == AVERROR(EINVAL))
             res = AVERROR_INVALIDDATA;
-        else if (res == AVERROR(EAGAIN) && c->internal->draining)
+        else if (res == AVERROR(EAGAIN)) {
+            if (!c->internal->draining)
+                return 1;
             res = AVERROR_EOF;
-
-        return res;
+        }
     }
 
+    return res;
+}
+
+static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
+{
+    Libdav1dContext *dav1d = c->priv_data;
+    Dav1dPicture pic = { 0 }, *p = &pic;
+    AVPacket *pkt;
+    OpaqueData *od = NULL;
+#if FF_DAV1D_VERSION_AT_LEAST(5,1)
+    enum Dav1dEventFlags event_flags = 0;
+#endif
+    int res;
+
+    do {
+        res = libdav1d_receive_frame_internal(c, p);
+        if (res < 0)
+            return res;
+    } while (res);
+
     av_assert0(p->data[0] && p->allocator_data);
 
     // This requires the custom allocator above