From patchwork Sun Nov 17 23:55:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16308 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 6794F449D44 for ; Mon, 18 Nov 2019 02:01:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4EFE068A61E; Mon, 18 Nov 2019 02:01:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94B0868A590 for ; Mon, 18 Nov 2019 02:01:51 +0200 (EET) Received: by mail-qt1-f194.google.com with SMTP id t8so18228340qtc.6 for ; Sun, 17 Nov 2019 16:01:51 -0800 (PST) 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=RGRggaRNPsHcd0gXnclSS8qsLLpO50kSRBsDn6vEHkg=; b=eHpJUuy8RsTXcX4obKMCy3NbJZB/H0UMYenc5WYSQNHTwI0WZrsx+lLdXi69njdlf4 wsBXSae8QI+gl4xbsttLjnb7StcvNdRUHUqMG9Ndq1n7AUbLjNJaHhn1R5aXP9sn2tIz WzOj90cAWI80WZKmzltwLtcsngoL8W0yYwWE9W3jBz3xRkD84a9UIfwE/Zob3HDImMBA cle/AE9bS2k6ZiZPUhmOtNtAOlZNWPkUVsk8W3xroEE66n8fylfAefpLMDnIK3QyBO8D LPEZxXhMBgMosL/gnNu7GRsycz3vrUqaB7yQi7CC78V14xgz+VD6cHQ41N0pIbrDqO6N QjTw== 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=RGRggaRNPsHcd0gXnclSS8qsLLpO50kSRBsDn6vEHkg=; b=mOW7W40HtW6j6/iayHzw6v/OYyLaF/oocMcHtQfNRUdJy+Y6FWvtCb4aYkwIAABTCn 1NyavtalK+t5cmouY/aW2NTiRYFhP1Ue22vGHhbPmpgdFhVAybz43vEdNv1WraXy/LQw aXardSR9XZCqCHArscuGtl06uI74gahR+4p7w+uX7fDmgViWjPAOYpDHA5QM2ZKZU07n HPr30UDGiaytik1+Vo/XcIMBm+EHrXgRNTosut41ouZHieFe42SEn+0ygoYQ6OIF43I8 TGL37Eh+EGFFnlSTYTBHD9r8L1gsmqgTHLR7IXNz6RpxgOnwptOXxYilUSuvybbruz0U o3Eg== X-Gm-Message-State: APjAAAXIcPZpC9hXNQEIVvFau0CMD7GuC+eXC/ZP866UuQStliCh8cVs W2EcjV2VGrBBaLvrG6XYDANl6jqTp0s= X-Google-Smtp-Source: APXvYqyFE8Z0ByLW6U9LiTm+AddMNN7dRFQmsZ8umKvZjkCU7n9r/u87Znz8MyKE6pvZT7sEnLVfig== X-Received: by 2002:a05:620a:205d:: with SMTP id d29mr22481912qka.152.1574034993004; Sun, 17 Nov 2019 15:56:33 -0800 (PST) Received: from localhost.localdomain ([191.84.233.108]) by smtp.gmail.com with ESMTPSA id 80sm5078003qkh.108.2019.11.17.15.56.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Nov 2019 15:56:32 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Nov 2019 20:55:50 -0300 Message-Id: <20191117235550.5017-2-jamrial@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191117235550.5017-1-jamrial@gmail.com> References: <20191117235550.5017-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] Revert "avcodec/cbs_av1_syntax_template: Check ref_frame_idx before use" 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 reverts commit 8174e5c77d8a94b57b6b1bcbb90728cf8b08ab6b. It's no longer needed after the previous commit. --- libavcodec/cbs_av1_syntax_template.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 796897ab79..6c4816f964 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -530,17 +530,16 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw, for (i = 0; i < AV1_REFS_PER_FRAME; i++) { flags(found_ref[i], 1, i); if (current->found_ref[i]) { - AV1ReferenceFrameState *ref; + AV1ReferenceFrameState *ref = + &priv->ref[current->ref_frame_idx[i]]; - if (current->ref_frame_idx[i] < 0 || - !priv->ref[current->ref_frame_idx[i]].valid) { + if (!ref->valid) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Missing reference frame needed for frame size " "(ref = %d, ref_frame_idx = %d).\n", i, current->ref_frame_idx[i]); return AVERROR_INVALIDDATA; } - ref = &priv->ref[current->ref_frame_idx[i]]; priv->upscaled_width = ref->upscaled_width; priv->frame_width = ref->frame_width;