From patchwork Sun Aug 23 19:23:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21855 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0CF0644AB55 for ; Sun, 23 Aug 2020 22:24:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F260A6897CD; Sun, 23 Aug 2020 22:24:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93B21689ABF for ; Sun, 23 Aug 2020 22:24:25 +0300 (EEST) Received: by mail-qk1-f181.google.com with SMTP id z3so1404635qkz.7 for ; Sun, 23 Aug 2020 12:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nfJ9MHDISBTHbjlm3mZ2ciSUTbeNZk8RK4RGjAOwoqg=; b=snMnA2q8oywylCN+ugojw1uj3pCPPb4m3qmJOWU0n/h/eWETojrcI6CJAPUiPh7iiI mn5r5vaKWGUcCvI8SUqpysZIcS+Y3TRq5bUJbAhhO8Rdd5zlkpQEuvRzbKYrVze6DHLF dXJx8gZ+5XbxJpEF2SGUGXfGNn6NaJCxDn1ixOMpYZGPs696tAJyr1E0eBwL4quFAcH/ 6a41UNPwugl4WU8+ZXtPAf4XE9EsQkjcgJP7qZCPIaRP6UBP10o4ZXF6djfHUZwXHWls giXsJBnoHtKAXSgkDnw2tsMvyd2p0nnkeV0ied+yGxumUDCIBCTvVTen1qnhT3CkefRd vxnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nfJ9MHDISBTHbjlm3mZ2ciSUTbeNZk8RK4RGjAOwoqg=; b=bH4nmGGBmdiVURVZcNkdCG5G8cucvF+ahzBpVM8FFww5Nk2oTgQFgkm4Nu6eNjUY+E Xn26ybz9T5G+pxZ+iJiL5iEHGgrwUa2qutnVWmfrQiI4NcPDr8dbvamVfnqZQiBCd2sg Va+wHIg2HXDJpGorXu1sbmysweSLIy3A4IwDQSMMZuLGjsIp5zAKqEH7DdfTvWckH4wo mSUbRFvN3zmfG9c35fOb2KDuFt1xYaTlRG4AKfd6yzf/Es1kXd4BzI7GffOWSMjZSf/M 9kDDLbwo9MamgwDE5VUCO2gg0JZtPA7fFVCZL9/tnGgOSPunnJHWJn0Efim+0GoI0wAw S5yw== X-Gm-Message-State: AOAM532csk9G5T7IrTHen7yEsk+4fH4IYu6Cjpp/JKfr64QzpftPX7qc NTBlwCzZCPbOSvGRyRdQot/u5cB5ovM= X-Google-Smtp-Source: ABdhPJzKjSG1r48C7aiO6Ny7KN3MRJOjvryKFTkgb6ajwQZTwF2bQ7hRrQXbNW5pCO3rDTu8LiZMlg== X-Received: by 2002:a37:9a88:: with SMTP id c130mr2046956qke.298.1598210663984; Sun, 23 Aug 2020 12:24:23 -0700 (PDT) Received: from localhost.localdomain ([181.23.70.159]) by smtp.gmail.com with ESMTPSA id y9sm7890838qka.0.2020.08.23.12.24.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 12:24:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 16:23:57 -0300 Message-Id: <20200823192358.12087-3-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200823192358.12087-1-jamrial@gmail.com> References: <20200823192358.12087-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/av1_parser: read frame properties directly from AV1RawFrameHeader X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Simplifies code Signed-off-by: James Almer --- 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;