[FFmpeg-devel] [PATCH] avformat/av1dec: fix EOF check in Annex-B demuxer

[James Almer]

And return any packet buffered by the bsf.

Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavformat/av1dec.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
index 216d4e2298..842dc588ab 100644
--- a/libavformat/av1dec.c
+++ b/libavformat/av1dec.c
@@ -131,6 +131,8 @@ static int leb(AVIOContext *pb, uint32_t *len) {
     do {
         unsigned bits;
         byte = avio_r8(pb);
+        if (pb->eof_reached || pb->error)
+            return pb->error ? pb->error : AVERROR_EOF;
         more = byte & 0x80;
         bits = byte & 0x7f;
         if (i <= 3 || (i == 4 && bits < (1 << 4)))
@@ -139,8 +141,6 @@ static int leb(AVIOContext *pb, uint32_t *len) {
             return AVERROR_INVALIDDATA;
         if (++i == 8 && more)
             return AVERROR_INVALIDDATA;
-        if (pb->eof_reached || pb->error)
-            return pb->error ? pb->error : AVERROR(EIO);
     } while (more);
     return i;
 }
@@ -235,18 +235,23 @@ retry:
 
     if (!c->temporal_unit_size) {
         len = leb(s->pb, &c->temporal_unit_size);
-        if (len < 0) return AVERROR_INVALIDDATA;
+        if (len == AVERROR_EOF) goto end;
+        else if (len < 0) return len;
     }
 
     if (!c->frame_unit_size) {
         len = leb(s->pb, &c->frame_unit_size);
-        if (len < 0 || ((int64_t)c->frame_unit_size + len) > c->temporal_unit_size)
+        if (len < 0)
+            return len == AVERROR_EOF ? AVERROR(EIO) : len;
+        if (((int64_t)c->frame_unit_size + len) > c->temporal_unit_size)
             return AVERROR_INVALIDDATA;
         c->temporal_unit_size -= len;
     }
 
     len = leb(s->pb, &obu_unit_size);
-    if (len < 0 || ((int64_t)obu_unit_size + len) > c->frame_unit_size)
+    if (len < 0)
+        return len == AVERROR_EOF ? AVERROR(EIO) : len;
+    if (((int64_t)obu_unit_size + len) > c->frame_unit_size)
         return AVERROR_INVALIDDATA;
 
     ret = av_get_packet(s->pb, pkt, obu_unit_size);
-- 
2.40.1