From patchwork Sun Aug 23 02:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21827 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 946C9447CDD for ; Sun, 23 Aug 2020 05:25:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B87568B591; Sun, 23 Aug 2020 05:25:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5064D68AD2F for ; Sun, 23 Aug 2020 05:25:21 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id j187so4652410qke.11 for ; Sat, 22 Aug 2020 19:25:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4ToxXiXavDWGe4OsbijdKhAELCWYG0u0yJCwXRCcmyo=; b=hcOfpzgwN0phujtVIi9B6DQq2rx2+2z61VoPSRFlXwFjf61ubfQYtiiTCOXHVrbtlO uubGWIBeN157xMVkOQb+cFT12BxSvYndCvO0JnDYi1UuS0RxGrdPvzy+ce/ITOcYJFEj 5AtMcpI06zkFVC2ukpCIC/4KhsBCvaiswDbkla2JAIBtiuKk7NMRH5sBPqw18t3Tn5aM oDO+qmPXyDYideNhaMLrVxKzmkXwolC6+R0IAOeSmf/6Wqo5elgRyuMjo38ajFTCzwJI /T25Vla7V2DsUrinlqwky03w4OSywMsZqDn8/IWvY3kTP5+ibXJQqlzcelAiDrqiQsQp CjIw== 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:mime-version :content-transfer-encoding; bh=4ToxXiXavDWGe4OsbijdKhAELCWYG0u0yJCwXRCcmyo=; b=Ba5sNig93pCCCTKiU1qUY8QtHPPsFz5/AaV65nFrFuP1iVRE+etETd6w1MjtmlknG7 jnqWfHw5pOOrfhgpJaAWPoNjqFtH49crjsHxnv2AoZMRphRdBYbpmseTSDkMSFczlQxy XzY7X2K98QXVKo80vr4nnhpzcXYg8mNuLw9ErV+D1vSEa8ROMN7LN+pHcQ2oVIWR0Uzv 6AAZXt0dFsmbeoHKQUGpKeoNad5rYsICia2qWsvwd4UMHnKkiXdSlEHpm9z/Q2MMDrHL ywfaaPnnRqelbXA3F8EMVBDz/qA+liq0+PY0CnfgGO4CrpyQbpMIfTslHzFc9vOl6NGw kHkQ== X-Gm-Message-State: AOAM5315w9y8hLj4Q+nRhs/bxTZLKdUDSCWiJncPy7OGyHFnuDo2omQd pwrT64gkAFwn/MQo5dl4Lp04rtwB3WHNbw== X-Google-Smtp-Source: ABdhPJyh+o6Lh+SUia5GS5BNbgKW5zV1LrWvg3KX0gYUgcM3qXO5VmZgP35Ru+ZpV1KBEM2BF3vtXg== X-Received: by 2002:ac8:51d7:: with SMTP id d23mr21274qtn.382.1598148152136; Sat, 22 Aug 2020 19:02:32 -0700 (PDT) Received: from localhost.localdomain ([181.23.70.159]) by smtp.gmail.com with ESMTPSA id 20sm7702506qtp.53.2020.08.22.19.02.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2020 19:02:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Aug 2020 23:02:16 -0300 Message-Id: <20200823020218.12659-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/cbs_av1: add derived frame size to 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" Same logic as tile_cols and tile_rows, this saves CBS users having to recalculate these values, and makes them available for all frames within a Temporal Unit. Signed-off-by: James Almer --- Not a fan of adding more derived values to "raw" structs, but much like the tile ones, these will be useful. libavcodec/cbs_av1.h | 8 +++++++ libavcodec/cbs_av1_syntax_template.c | 32 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index f5fed220a5..4482498eb3 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -161,6 +161,14 @@ typedef struct AV1RawFrameHeader { uint8_t render_width_minus_1; uint8_t render_height_minus_1; + // These are derived values, but it's very unhelpful to have to + // recalculate them all the time so we store them here. + uint32_t upscaled_width; + uint32_t frame_width; + uint32_t frame_height; + uint32_t render_width; + uint32_t render_height; + uint8_t found_ref[AV1_REFS_PER_FRAME]; uint8_t refresh_frame_flags; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index a315e8868a..27d04375fc 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -468,9 +468,9 @@ static int FUNC(superres_params)(CodedBitstreamContext *ctx, RWContext *rw, denom = AV1_SUPERRES_NUM; } - priv->upscaled_width = priv->frame_width; - priv->frame_width = (priv->upscaled_width * AV1_SUPERRES_NUM + - denom / 2) / denom; + priv->upscaled_width = current->upscaled_width = priv->frame_width; + priv->frame_width = current->frame_width = (priv->upscaled_width * AV1_SUPERRES_NUM + + denom / 2) / denom; return 0; } @@ -486,11 +486,11 @@ static int FUNC(frame_size)(CodedBitstreamContext *ctx, RWContext *rw, fb(seq->frame_width_bits_minus_1 + 1, frame_width_minus_1); fb(seq->frame_height_bits_minus_1 + 1, frame_height_minus_1); - priv->frame_width = current->frame_width_minus_1 + 1; - priv->frame_height = current->frame_height_minus_1 + 1; + priv->frame_width = current->frame_width = current->frame_width_minus_1 + 1; + priv->frame_height = current->frame_height = current->frame_height_minus_1 + 1; } else { - priv->frame_width = seq->max_frame_width_minus_1 + 1; - priv->frame_height = seq->max_frame_height_minus_1 + 1; + priv->frame_width = current->frame_width = seq->max_frame_width_minus_1 + 1; + priv->frame_height = current->frame_height = seq->max_frame_height_minus_1 + 1; } CHECK(FUNC(superres_params)(ctx, rw, current)); @@ -510,11 +510,11 @@ static int FUNC(render_size)(CodedBitstreamContext *ctx, RWContext *rw, fb(16, render_width_minus_1); fb(16, render_height_minus_1); - priv->render_width = current->render_width_minus_1 + 1; - priv->render_height = current->render_height_minus_1 + 1; + priv->render_width = current->render_width = current->render_width_minus_1 + 1; + priv->render_height = current->render_height = current->render_height_minus_1 + 1; } else { - priv->render_width = priv->upscaled_width; - priv->render_height = priv->frame_height; + priv->render_width = current->render_width = current->upscaled_width; + priv->render_height = current->render_height = current->frame_height; } return 0; @@ -540,11 +540,11 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw, return AVERROR_INVALIDDATA; } - priv->upscaled_width = ref->upscaled_width; - priv->frame_width = ref->frame_width; - priv->frame_height = ref->frame_height; - priv->render_width = ref->render_width; - priv->render_height = ref->render_height; + priv->upscaled_width = current->upscaled_width = ref->upscaled_width; + priv->frame_width = current->frame_width = ref->frame_width; + priv->frame_height = current->frame_height = ref->frame_height; + priv->render_width = current->render_width = ref->render_width; + priv->render_height = current->render_height = ref->render_height; break; } } From patchwork Sun Aug 23 02:02:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21825 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 DCF06449541 for ; Sun, 23 Aug 2020 05:02:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAA9668B591; Sun, 23 Aug 2020 05:02:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 737EE68B2AB for ; Sun, 23 Aug 2020 05:02:35 +0300 (EEST) Received: by mail-qv1-f67.google.com with SMTP id b2so2326040qvp.9 for ; Sat, 22 Aug 2020 19:02:35 -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=9wTGbfBRp5TMDGryDdIncQqkGkHbOUD1nwGq+1Ev+kM=; b=ozX0dkImXoG/rMpwpdfO2PMoQph7OeWSeGgmVZ8C78Ppl4A8oGjqfxLdVgIwPklLKA lQzKfJ1g+S2FCSddjl7r2KMK3oggRPjFDaLzgxQ14UnjAFUQOXazXAenOH5/ErKHvOww o+0x4X06Ifq4oSrL/68yLXp3A65x4T9Qfsd4BGGXivDI+GIfeTAZJubKPHb6UcmDiVTY fbrZgxDmFJERH4dfTu8mfkWQggwxlLt2cmQyc0yF42xrGhAna/cVgDHZDEo+0uFsN72p Mnfq1IStPmqzemypJ7cwpnrHFEQBjD8ARDRm9UVWxpUIUiDXHcIL51k2I/WuF3wM6RN9 L06w== 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=9wTGbfBRp5TMDGryDdIncQqkGkHbOUD1nwGq+1Ev+kM=; b=sAgUT3ckryO00yvmGOvXTpZEwo2E8IPDCg+1M55y1FR9h8pBd0yT+y5rf+RGHr+qtk Lzz8iNf2sMhjNIxy0o8rAJW156eNPCgR6iubd1bw84CGpLhRLT9c2cQ/ArmFqp1vZDgG VJcTaEr9+0u4mFzOmgu9ewuyGvQtU1D1C0NwO54KR5Gn+altCzmhT3P8cqyMLAJOkCjm hEi4E6WNWUYRtqKVTNLO3RNNR6+Nf9C46pbvXTrIz10a8LymNt7lEAnG16xU+xb7drde zw0rEBrB3nosE5+MViANrI9PVFzKxIFlWraemuSSaKa1n8cD6dUMedjLPwMsM04yyfYB ZTzw== X-Gm-Message-State: AOAM532HHbO4S7k1ugjYHhUvq/NkioA88EFIpjkSM5a3gI1IH53rAwcb OvvDL1nM1MvWp2j2SxAPEsKbJ79wcJQ= X-Google-Smtp-Source: ABdhPJw2anOwvVEzZWf5vinbEzTnl80juigvkZL5CrgTpU+Sf1JO/UgvECCDHxlnGTQeyqnmlRMMSg== X-Received: by 2002:a0c:eb87:: with SMTP id x7mr12609qvo.79.1598148153652; Sat, 22 Aug 2020 19:02:33 -0700 (PDT) Received: from localhost.localdomain ([181.23.70.159]) by smtp.gmail.com with ESMTPSA id 20sm7702506qtp.53.2020.08.22.19.02.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2020 19:02:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Aug 2020 23:02:17 -0300 Message-Id: <20200823020218.12659-2-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200823020218.12659-1-jamrial@gmail.com> References: <20200823020218.12659-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/av1_parser: read frame dimensions 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" Signed-off-by: James Almer --- libavcodec/av1_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index cd426a2b0f..0a34f20a59 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -127,8 +127,8 @@ static int av1_parser_parse(AVCodecParserContext *ctx, } else if (!frame->show_frame) { continue; } else { - ctx->width = av1->frame_width; - ctx->height = av1->frame_height; + ctx->width = frame->frame_width; + ctx->height = frame->frame_height; frame_type = frame->frame_type; ctx->key_frame = frame_type == AV1_FRAME_KEY; From patchwork Sun Aug 23 02:02:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21826 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 15A10449541 for ; Sun, 23 Aug 2020 05:02:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFF6368B5E0; Sun, 23 Aug 2020 05:02:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 022D368B610 for ; Sun, 23 Aug 2020 05:02:36 +0300 (EEST) Received: by mail-qv1-f45.google.com with SMTP id w2so2314183qvh.12 for ; Sat, 22 Aug 2020 19:02:36 -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=XfQWmmQfnWImnheqaQtHsh6X33AAQHbL4KNWGJHx8rU=; b=P7RPyRXJ9Cw0BUtQZDXTbFT39lq2RtGLQfyqOHBB3E5UerZxgOr8PwPwjrmwXd+j0E KLL5PI+Zpvwb6At4dvuFwBLjtrOnzF15oMtV4Z5eouxZwVsNUiqDsbSIyFdGoDf3GUmm 11hvNtjGAw5ubpGlLsF5txxgsLyfY5vwere8JGiJQu1kGABdnU8JJLbzq6OL8+eYfc97 RMT1okPvgX00ZvjPvJ4LuuWqTbXbn47dtdyOV3vV/jiZhTIt8Wg1FIzlS8h5y9Pd1FWr q11wjtgL7h1wzl7nYv94ss6P0O+IMornUso42+ZjJ3N9gWod1+L/Mn94qRofQljDWTz9 Gx6g== 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=XfQWmmQfnWImnheqaQtHsh6X33AAQHbL4KNWGJHx8rU=; b=SlMHX9iaWLKJ4AkYBKzHvPcpQ6ioOgXrkWF7BMCfaUGMrOGxX5If4bEAAM7OfN3rVP N8UTIkL4a0MKH8CZ8FsvhnoJ5HI/Cla9wm7WN7w4mzHvRI9OctP3b5iht1xMN7nHlJc4 9T66n5AXHJ9UzmV1AdIKbpIssNYkpqxwbfgexnN9CmlCYteLltlmDk5sSWHv+I/OioIp JLS/7pJ+fvwdQe35X1btTIeaClfV+3656M6hGDu08tJTketmPzIb9S21k4yGBvLtysfY 9JaKuVEB0K8uY4VkxBKZVr96KawzyWUJsdT6/9Y7WizDBEkYPWrtzSmaDVqwoD9xCB4k 0ZKw== X-Gm-Message-State: AOAM531U30M75J2gDmvh4MW3v2VfDFPyHprKbhXpqtMhg2F0h/NM7SUA mmT7l2oL2D6Laj0AwWh6hwOnsY2uliw= X-Google-Smtp-Source: ABdhPJxkK1ixBpDrIMSdYnufw250ibPljVZEVjR9LaEYoMsEYu3iF5aNxpJauUSxXPnYhNLx0Nwf6A== X-Received: by 2002:ad4:4503:: with SMTP id k3mr17590qvu.43.1598148155107; Sat, 22 Aug 2020 19:02:35 -0700 (PDT) Received: from localhost.localdomain ([181.23.70.159]) by smtp.gmail.com with ESMTPSA id 20sm7702506qtp.53.2020.08.22.19.02.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2020 19:02:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Aug 2020 23:02:18 -0300 Message-Id: <20200823020218.12659-3-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200823020218.12659-1-jamrial@gmail.com> References: <20200823020218.12659-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/cbs_av1: remove frame dimensions from CodedBitstreamAV1Context 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" The values contained in these fields are only valid for the last frame parsed by CBS. Unlike tile_rows and tile_cols, these are not used in functions within cbs_av1_syntax_template.c that don't have access to the relevant AV1RawFrameHeader, and since each frame now has their relevant derived values, there's no need to keep these here anymore. Signed-off-by: James Almer --- libavcodec/cbs_av1.h | 5 --- libavcodec/cbs_av1_syntax_template.c | 55 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 4482498eb3..0eb78bef83 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -437,11 +437,6 @@ typedef struct CodedBitstreamAV1Context { int operating_point_idc; int bit_depth; - int frame_width; - int frame_height; - int upscaled_width; - int render_width; - int render_height; int num_planes; int coded_lossless; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 27d04375fc..96dc864bd2 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -468,9 +468,9 @@ static int FUNC(superres_params)(CodedBitstreamContext *ctx, RWContext *rw, denom = AV1_SUPERRES_NUM; } - priv->upscaled_width = current->upscaled_width = priv->frame_width; - priv->frame_width = current->frame_width = (priv->upscaled_width * AV1_SUPERRES_NUM + - denom / 2) / denom; + current->upscaled_width = current->frame_width; + current->frame_width = (current->upscaled_width * AV1_SUPERRES_NUM + + denom / 2) / denom; return 0; } @@ -486,11 +486,11 @@ static int FUNC(frame_size)(CodedBitstreamContext *ctx, RWContext *rw, fb(seq->frame_width_bits_minus_1 + 1, frame_width_minus_1); fb(seq->frame_height_bits_minus_1 + 1, frame_height_minus_1); - priv->frame_width = current->frame_width = current->frame_width_minus_1 + 1; - priv->frame_height = current->frame_height = current->frame_height_minus_1 + 1; + current->frame_width = current->frame_width_minus_1 + 1; + current->frame_height = current->frame_height_minus_1 + 1; } else { - priv->frame_width = current->frame_width = seq->max_frame_width_minus_1 + 1; - priv->frame_height = current->frame_height = seq->max_frame_height_minus_1 + 1; + current->frame_width = seq->max_frame_width_minus_1 + 1; + current->frame_height = seq->max_frame_height_minus_1 + 1; } CHECK(FUNC(superres_params)(ctx, rw, current)); @@ -501,7 +501,6 @@ static int FUNC(frame_size)(CodedBitstreamContext *ctx, RWContext *rw, static int FUNC(render_size)(CodedBitstreamContext *ctx, RWContext *rw, AV1RawFrameHeader *current) { - CodedBitstreamAV1Context *priv = ctx->priv_data; int err; flag(render_and_frame_size_different); @@ -510,11 +509,11 @@ static int FUNC(render_size)(CodedBitstreamContext *ctx, RWContext *rw, fb(16, render_width_minus_1); fb(16, render_height_minus_1); - priv->render_width = current->render_width = current->render_width_minus_1 + 1; - priv->render_height = current->render_height = current->render_height_minus_1 + 1; + current->render_width = current->render_width_minus_1 + 1; + current->render_height = current->render_height_minus_1 + 1; } else { - priv->render_width = current->render_width = current->upscaled_width; - priv->render_height = current->render_height = current->frame_height; + current->render_width = current->upscaled_width; + current->render_height = current->frame_height; } return 0; @@ -540,11 +539,11 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw, return AVERROR_INVALIDDATA; } - priv->upscaled_width = current->upscaled_width = ref->upscaled_width; - priv->frame_width = current->frame_width = ref->frame_width; - priv->frame_height = current->frame_height = ref->frame_height; - priv->render_width = current->render_width = ref->render_width; - priv->render_height = current->render_height = ref->render_height; + current->upscaled_width = ref->upscaled_width; + current->frame_width = ref->frame_width; + current->frame_height = ref->frame_height; + current->render_width = ref->render_width; + current->render_height = ref->render_height; break; } } @@ -585,8 +584,8 @@ static int FUNC(tile_info)(CodedBitstreamContext *ctx, RWContext *rw, int min_log2_tiles, min_log2_tile_rows; int i, err; - mi_cols = 2 * ((priv->frame_width + 7) >> 3); - mi_rows = 2 * ((priv->frame_height + 7) >> 3); + mi_cols = 2 * ((current->frame_width + 7) >> 3); + mi_rows = 2 * ((current->frame_height + 7) >> 3); sb_cols = seq->use_128x128_superblock ? ((mi_cols + 31) >> 5) : ((mi_cols + 15) >> 4); @@ -1412,7 +1411,7 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(render_size)(ctx, rw, current)); if (current->allow_screen_content_tools && - priv->upscaled_width == priv->frame_width) + current->upscaled_width == current->frame_width) flag(allow_intrabc); else infer(allow_intrabc, 0); @@ -1515,7 +1514,7 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, } } priv->all_lossless = priv->coded_lossless && - priv->frame_width == priv->upscaled_width; + current->frame_width == current->upscaled_width; CHECK(FUNC(loop_filter_params)(ctx, rw, current)); @@ -1546,11 +1545,11 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, priv->ref[i] = (AV1ReferenceFrameState) { .valid = 1, .frame_id = current->current_frame_id, - .upscaled_width = priv->upscaled_width, - .frame_width = priv->frame_width, - .frame_height = priv->frame_height, - .render_width = priv->render_width, - .render_height = priv->render_height, + .upscaled_width = current->upscaled_width, + .frame_width = current->frame_width, + .frame_height = current->frame_height, + .render_width = current->render_width, + .render_height = current->render_height, .frame_type = current->frame_type, .subsampling_x = seq->color_config.subsampling_x, .subsampling_y = seq->color_config.subsampling_y, @@ -1563,8 +1562,8 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, av_log(ctx->log_ctx, AV_LOG_DEBUG, "Frame %d: size %dx%d " "upscaled %d render %dx%d subsample %dx%d " "bitdepth %d tiles %dx%d.\n", current->order_hint, - priv->frame_width, priv->frame_height, priv->upscaled_width, - priv->render_width, priv->render_height, + current->frame_width, current->frame_height, current->upscaled_width, + current->render_width, current->render_height, seq->color_config.subsampling_x + 1, seq->color_config.subsampling_y + 1, priv->bit_depth, priv->tile_rows, priv->tile_cols);