From patchwork Sun May 19 13:28:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49010 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3919319pzb; Sun, 19 May 2024 06:28:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVOikwGV19Q3bErnKn7sGqMWGkBRIlEPO8eoflJ6gZMwucoj7nmtt6RpjBcqG+VSUXXu6sP0yOK++IL+CWWbQiQw8eoYPhe54o1Kw== X-Google-Smtp-Source: AGHT+IGeB2GG+5xc4W32VUn5reDbPPCK06RggfQjWhEiTaGQfqLHwr5o7FcHb0zNjbNMHpCfMRAh X-Received: by 2002:a17:906:a1cc:b0:a5c:e824:1622 with SMTP id a640c23a62f3a-a5ce82416c7mr628297466b.43.1716125324973; Sun, 19 May 2024 06:28:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716125324; cv=none; d=google.com; s=arc-20160816; b=mCG0qRTX6jL7DODDCbidlawN6ZuL+y8pLeXjLSbmpoTfsB2PsvLvBw5fLi84GgHxZz uFYRV/Npt3sWhMTh3vDVo6fUCZoYSCSJ53MW06ezWskAK+jHLCi0mIcg2K/GMaYFC/kt KtsuxreovW5iapLHu1UC5O1b9ZKyrD892K/goD8nke/21wKfXvFwTpQETEUbLhRCWW+j 61b+a6fzL7rhS2KasaEcELLaoGdVUVqSDk4m6WiItVV5XhqmWtLP1mO1QC/OAT+y6jxO wG4IvlYYdoLlIlR+v4A26CQL8vHv8y9BUIVv77EmCdrppaUjTQKOMIY2Ez0FEeXlSmXe hmhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=XHZLrliQB/8SwnfW70v53XbXv36MIgKEz4++5aCi8Uo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=XSDfiAASaAxHDXDyhGhNAOscbEmP4hLueZQtBhAaeZEhYkZUOxcvcqFbn3HGtn+3Hi U/zHEObyi/3SMAHIzNzVE+IA7SXP4YgBGe8C7EkkFUoaObeWpvKmEkVxm0WZ5ut7Jm5N cBBuTfdUF2Ehcrfo+OodKfB3htCQAu6KinzBSlKyS88L5U6yf9eo5RdoqXJMvMeXHyoH orqN+Eu55hWU4bm9g35RvrZ9gVBHNEOe+LwneSxyz/Xy2UbBPA9+wpPM7mYexyQHV7bY JVf6T02Jqxk51OSJun8xwZp4l8Y0znQncui7BbK/ZVrnR1+NlDapxBw3d3j+QKpRkaeD m6rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="EXL/KDB3"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17945cacsi1235633466b.165.2024.05.19.06.28.44; Sun, 19 May 2024 06:28:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="EXL/KDB3"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AAC7C68B02D; Sun, 19 May 2024 16:28:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C02A968C4F5 for ; Sun, 19 May 2024 16:28:34 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1ec41d82b8bso59313965ad.2 for ; Sun, 19 May 2024 06:28:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716125312; x=1716730112; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=rOvjUVxSL8SriK18qom8rD8XJ8TS0IhWTpwYEinHJ5o=; b=EXL/KDB3HibDLjQ2VMD0BO/mPvLe/u/CiHRLVMtVVjkQAcBu5atKzyopZSFrlsiAuF dflDEPSMAMztt8nKgISKa/64FW6/L7PRla51K3EV960ccAi2CvEouyauuqbqa7pRp0Sc 8o/16/tnV4U+wU8qWRLEPzONz4I6csBIUiT1mn4tHvqCMbZFswjQFDz9GibGwWS0WkEE uuFIMLbowED9WtoWQ7oRWa3Aw4W5xpdensi9/CxZ10GT7Gr7xuQwLHxdw1IBaCSncKuE n6cgQU66syqBeHfg/bckvMTcDfZGZqPGfQKYBgaIxBMJTFIUg6fAEsoW7TKpq3GzR64u CV1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716125312; x=1716730112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rOvjUVxSL8SriK18qom8rD8XJ8TS0IhWTpwYEinHJ5o=; b=kV0vo64queVGiQlLBY/4LyZxvN+HCPCOjgqdYU2ZK+QWAwihFKRi/Hb3ue598yXo7S 4MUEY/VaBnSBkkgEXcEFHyFUaGggD2xGoICzZ5NPMYuxZlVB+Xtr59qbGm9+vwR14geJ 5ZrAzeo/2QlsGGk4/6sjK/T3RarYiYKZFuH5jei55/PZd4VgS/zyA8SDDHCpFstEnFql xQEJ+gRFyqX8l1a9CmQdo/891clMVkg+7q81TO2ET86EbVdu5nlk+Lga39VuFYUR9Vo/ 8rlHTsbS0SzdMuc+F4jTJke+oBJC7zXjjd814xBm6NcmeDcz/VHVIiLSCg8QXpaRFlm0 mifg== X-Gm-Message-State: AOJu0YwNRzbiSj5WKl3feiuGTGzuXkWmmWjO/3CSyuXvbZ/cihMxS1cJ ZZHtwgJgsmw+eUQWqPGLyKWAKpoVqc5AK88B/0DE+kkhFTNI9YzVCRlWwQ== X-Received: by 2002:a17:902:d2c6:b0:1f2:f1bf:cf44 with SMTP id d9443c01a7336-1f2f1bfd17fmr43092665ad.6.1716125312196; Sun, 19 May 2024 06:28:32 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f2f46c28desm18094215ad.221.2024.05.19.06.28.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 May 2024 06:28:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 10:28:19 -0300 Message-ID: <20240519132819.3365-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_h266: read vps_ptl_max_tid before using it X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: CDbHJxD5CiXz Signed-off-by: James Almer --- libavcodec/cbs_h266_syntax_template.c | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 725cee5b03..38685704c5 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -790,6 +790,21 @@ static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, infer(vps_each_layer_is_an_ols_flag, 1); infer(vps_num_ptls_minus1, 0); } + + for (i = 0; i <= current->vps_num_ptls_minus1; i++) { + if (i > 0) + flags(vps_pt_present_flag[i], 1, i); + else + infer(vps_pt_present_flag[i], 1); + + if (!current->vps_default_ptl_dpb_hrd_max_tid_flag) + us(3, vps_ptl_max_tid[i], 0, current->vps_max_sublayers_minus1, 1, i); + else + infer(vps_ptl_max_tid[i], current->vps_max_sublayers_minus1); + } + while (byte_alignment(rw) != 0) + fixed(1, vps_ptl_alignment_zero_bit, 0); + { //calc NumMultiLayerOlss int m; @@ -915,19 +930,6 @@ static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, return AVERROR_INVALIDDATA; } - for (i = 0; i <= current->vps_num_ptls_minus1; i++) { - if (i > 0) - flags(vps_pt_present_flag[i], 1, i); - else - infer(vps_pt_present_flag[i], 1); - - if (!current->vps_default_ptl_dpb_hrd_max_tid_flag) - us(3, vps_ptl_max_tid[i], 0, current->vps_max_sublayers_minus1, 1, i); - else - infer(vps_ptl_max_tid[i], current->vps_max_sublayers_minus1); - } - while (byte_alignment(rw) != 0) - fixed(1, vps_ptl_alignment_zero_bit, 0); for (i = 0; i <= current->vps_num_ptls_minus1; i++) { CHECK(FUNC(profile_tier_level) (ctx, rw, current->vps_profile_tier_level + i,