Simplifies code
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/av1_parser.c | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c
index cd426a2b0f..1b9868d364 100644
--- a/libavcodec/av1_parser.c
+++ b/libavcodec/av1_parser.c
@@ -99,7 +99,6 @@ static int av1_parser_parse(AVCodecParserContext *ctx,
CodedBitstreamUnit *unit = &td->units[i];
AV1RawOBU *obu = unit->content;
AV1RawFrameHeader *frame;
- int frame_type;
if (unit->type == AV1_OBU_FRAME)
frame = &obu->obu.frame.header;
@@ -111,30 +110,15 @@ static int av1_parser_parse(AVCodecParserContext *ctx,
if (obu->header.spatial_id > 0)
continue;
- if (frame->show_existing_frame) {
- AV1ReferenceFrameState *ref =
&av1->ref[frame->frame_to_show_map_idx];
-
- if (!ref->valid) {
- av_log(avctx, AV_LOG_ERROR, "Invalid reference frame\n");
- goto end;
- }
-
- ctx->width = ref->frame_width;
- ctx->height = ref->frame_height;
- frame_type = ref->frame_type;
-
- ctx->key_frame = 0;
- } else if (!frame->show_frame) {
+ if (!frame->show_frame)
continue;
- } else {
- ctx->width = av1->frame_width;
- ctx->height = av1->frame_height;
- frame_type = frame->frame_type;
- ctx->key_frame = frame_type == AV1_FRAME_KEY;
- }
+ ctx->width = frame->frame_width_minus_1 + 1;
+ ctx->height = frame->frame_height_minus_1 + 1;
+
+ ctx->key_frame = frame->frame_type == AV1_FRAME_KEY &&
!frame->show_existing_frame;
- switch (frame_type) {
+ switch (frame->frame_type) {
case AV1_FRAME_KEY:
case AV1_FRAME_INTRA_ONLY:
ctx->pict_type = AV_PICTURE_TYPE_I;
--
2.27.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
