From patchwork Sun Aug 23 19:23:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21853 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 EAFEF44AB55 for ; Sun, 23 Aug 2020 22:24:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2C396898C1; Sun, 23 Aug 2020 22:24:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f68.google.com (mail-qv1-f68.google.com [209.85.219.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1143687F97 for ; Sun, 23 Aug 2020 22:24:22 +0300 (EEST) Received: by mail-qv1-f68.google.com with SMTP id r19so2843172qvw.11 for ; Sun, 23 Aug 2020 12:24:22 -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=HBxJ08ST/v4xNDxuA74kGm0PJwfM9q3M58PwTR/EH1w=; b=oXpk7nMqcmzpC6RHSkGbwnoM3ZDl4LpDiN6Ve2F5Ng3WDx8qoj0d+BYOs1N2asXHdv UKgYRomRSZx3EIWpXKLw6Yty6v3wRSiSeH92qh/byPulIkV1jK+SlHQUH94AJcCXRzBc 8ob6Ekto/pWV6DIGShJqxeP6AQZjUe7EGQREfwTqI8coSKygJXc7pIq1J7d8oH7ERf01 /v9ENDRfqshE/RR6TCrMvLPCmm9YaRoBOxZk3+tNS507b51410vV1BDJ10O2o4oGi0lT 1+j9vpd9gzf9J6GIv5Y604hCSCShC6UeTSloznojxi/va5lTMczaHHD5ToVCYeYB2/SA NPBA== 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=HBxJ08ST/v4xNDxuA74kGm0PJwfM9q3M58PwTR/EH1w=; b=LCw8L9QW/881+Rv0rPiDpKdk1JE7ODCu6AMBWB7tCWdKMga2iZ+dFQ8Vj2Gi5Dy6hl kzVl1+D197SxYudearsSavySG1bz6hoWBZqutUh69/iUisOsZTHQlLB/s56cVyMEVg0o 2nfIQq8uFAcwjpUdOLWU/i77CWjfdg1uOMyQAXdQY2MeUbqRf4GENfU3Hqnp1hCGrRhW MnhhaujhuHmIz1QXAFI51hUqj0Qsohph+hUA22Ye6SkqB0mvFtCEOduIMCsDHTiOBBUh lOahs+h296hQ4LrK3xtb2CKrShQF5rbLrCs+71rm42f6kv6hx62wcutPZj+oznvsz7ky G/lQ== X-Gm-Message-State: AOAM531+D5ArYZ47OR8ONyop9d1LyFXYwWW2UgH3ZJuKzwZRxUK9c32/ 7m0D5eZWms9Wv2oAysKS0lOA6U33FAg= X-Google-Smtp-Source: ABdhPJxiz6I5A+ljhvv5gxDLTp4VFmL0gancZiIL02zMOZXBgp/oaat0LhfpdAknGLZ8FETHDBPyFg== X-Received: by 2002:a0c:fa85:: with SMTP id o5mr2061935qvn.91.1598210660250; Sun, 23 Aug 2020 12:24:20 -0700 (PDT) Received: from localhost.localdomain ([181.23.70.159]) by smtp.gmail.com with ESMTPSA id y9sm7890838qka.0.2020.08.23.12.24.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 12:24:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 16:23:55 -0300 Message-Id: <20200823192358.12087-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: infer frame sizes when not coded in the bitstream 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" This makes them available for all frames within a Temporal Unit. Signed-off-by: James Almer --- libavcodec/cbs_av1_syntax_template.c | 43 +++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 3a832c3ca0..dedd549572 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -492,14 +492,14 @@ static int FUNC(frame_size)(CodedBitstreamContext *ctx, RWContext *rw, if (current->frame_size_override_flag) { 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; } else { - priv->frame_width = seq->max_frame_width_minus_1 + 1; - priv->frame_height = seq->max_frame_height_minus_1 + 1; + infer(frame_width_minus_1, seq->max_frame_width_minus_1); + infer(frame_height_minus_1, seq->max_frame_height_minus_1); } + priv->frame_width = current->frame_width_minus_1 + 1; + priv->frame_height = current->frame_height_minus_1 + 1; + CHECK(FUNC(superres_params)(ctx, rw, current)); return 0; @@ -516,14 +516,14 @@ static int FUNC(render_size)(CodedBitstreamContext *ctx, RWContext *rw, if (current->render_and_frame_size_different) { 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; } else { - priv->render_width = priv->upscaled_width; - priv->render_height = priv->frame_height; + infer(render_width_minus_1, current->frame_width_minus_1); + infer(render_height_minus_1, current->frame_height_minus_1); } + priv->render_width = current->render_width_minus_1 + 1; + priv->render_height = current->render_height_minus_1 + 1; + return 0; } @@ -547,6 +547,11 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw, return AVERROR_INVALIDDATA; } + infer(frame_width_minus_1, ref->upscaled_width - 1); + infer(frame_height_minus_1, ref->frame_height - 1); + infer(render_width_minus_1, ref->render_width - 1); + infer(render_height_minus_1, ref->render_height - 1); + priv->upscaled_width = ref->upscaled_width; priv->frame_width = ref->frame_width; priv->frame_height = ref->frame_height; @@ -1273,6 +1278,13 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, fb(3, frame_to_show_map_idx); frame = &priv->ref[current->frame_to_show_map_idx]; + if (!frame->valid) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "Missing reference frame needed for " + "show_existing_frame (frame_to_show_map_idx = %d).\n", + current->frame_to_show_map_idx); + return AVERROR_INVALIDDATA; + } + if (seq->decoder_model_info_present_flag && !seq->timing_info.equal_picture_interval) { fb(seq->decoder_model_info.frame_presentation_time_length_minus_1 + 1, @@ -1287,6 +1299,17 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, else infer(refresh_frame_flags, 0); + 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); + infer(render_height_minus_1, frame->render_height - 1); + + priv->upscaled_width = frame->upscaled_width; + priv->frame_width = frame->frame_width; + priv->frame_height = frame->frame_height; + priv->render_width = frame->render_width; + priv->render_height = frame->render_height; + return 0; }