[FFmpeg-cvslog] avcodec/cbs_av1: support one byte long OBUs when the size is not set in the bitstream

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Nov 10 21:08:37 2019 -0300| [245cbab556b88e5bd900da6708e7fe196b7ad8e5] | committer: James Almer

avcodec/cbs_av1: support one byte long OBUs when the size is not set in the bitstream

This will be needed by the next commit, where packets with a single Temporal
Delimiter OBU with no size will need to be parsed

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=245cbab556b88e5bd900da6708e7fe196b7ad8e5
---

 libavcodec/cbs_av1.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index c027933218..cca112ecf8 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -768,14 +768,13 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
         if (err < 0)
             goto fail;
 
-        if (get_bits_left(&gbc) < 8) {
-            av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment "
-                   "too short (%"SIZE_SPECIFIER" bytes).\n", size);
-            err = AVERROR_INVALIDDATA;
-            goto fail;
-        }
-
         if (header.obu_has_size_field) {
+            if (get_bits_left(&gbc) < 8) {
+                av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment "
+                       "too short (%"SIZE_SPECIFIER" bytes).\n", size);
+                err = AVERROR_INVALIDDATA;
+                goto fail;
+            }
             err = cbs_av1_read_leb128(ctx, &gbc, "obu_size", &obu_size);
             if (err < 0)
                 goto fail;