[FFmpeg-cvslog] avcodec/cbs_av1: infer frame_type in show_existing_frame frames earlier

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Aug 24 12:21:51 2020 -0300| [afbe9ebac7b47fec84703459bfe64fc90c2ad937] | committer: James Almer

avcodec/cbs_av1: infer frame_type in show_existing_frame frames earlier

This follows the spec and will come in handy in the next commit.

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

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

 libavcodec/cbs_av1_syntax_template.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
index 6a0a105904..258779c591 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -1294,12 +1294,12 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
             if (seq->frame_id_numbers_present_flag)
                 fb(id_len, display_frame_id);
 
-            if (frame->frame_type == AV1_FRAME_KEY)
+            infer(frame_type, frame->frame_type);
+            if (current->frame_type == AV1_FRAME_KEY)
                 infer(refresh_frame_flags, all_frames);
             else
                 infer(refresh_frame_flags, 0);
 
-            infer(frame_type,            frame->frame_type);
             infer(frame_width_minus_1,   frame->upscaled_width - 1);
             infer(frame_height_minus_1,  frame->frame_height - 1);
             infer(render_width_minus_1,  frame->render_width - 1);