From patchwork Sun May 19 13:25:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3918350pzb; Sun, 19 May 2024 06:26:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVii0PiEhXWM2waEP2enT7qsGuWP0RUsmYUL4MxxlcdcF7lvuyQElMJ8IG5aWsIH9oRE45ztnXvuQkIeJYKFhNlkZdXHUp3E8Wleg== X-Google-Smtp-Source: AGHT+IHcEtT+NX7nUwZPIxOtdl0T4Sdm1QjIzudFuAY212VRUPrMqoR1wa4HzFYLDpyHoqZSLsE2 X-Received: by 2002:ac2:5547:0:b0:51f:2909:3802 with SMTP id 2adb3069b0e04-522105818ffmr13830029e87.6.1716125179783; Sun, 19 May 2024 06:26:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716125179; cv=none; d=google.com; s=arc-20160816; b=F+qQHjJaLddIEN2U7XJcXV5yt+YJLIbeQzE5R6wk5rFlrB5F6EAA5yCAwo3C8bVM3+ IXPLnHAUe4OOEgRYdN5WxBZx/j3iSaCMFMtq7xX70KaEEjUtMYuWidFCVnzcoHkGKpUL XY/uyL0P9OC5WZVlty00pcKDMZ1gfYRCe3jfWLr7o4wrJehDaLFMWyfGBMYRrTl3lHef yJouSURUUOxLvvThfIxmxrWHmOaBuFqBo96PcBcGt2cM5vpRaGP26FtiNsxj9W+g9NEF oxAIFBJwjqXOI3ZLG/6RCA67kIntBDA46hFIAa/CuVn6Cx1+gvtk1D1VbUE4oarfjGse f1lw== 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=3LW1arvLIrRbsfQ9MsK3UkRVBAyfoQj7+XryZpiVNFY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=tzqnt6w/XRDrSwu500d+alD50meUx9F558HyOK4cctfL/U00QTdqH+9eeq+83PyCvw p91vrBVGzz654dq/Djt1xp0GWtdeqHY39ARwrzb1r701tR7UkBZmjwmm++UT9U0ZB4Oy DWivqIg8KYTvwnspVm7fNxk+fuCWmZPTLlomahfVXFIt1Z5Qhu0DBHmtkNvZbqX6xp8s UcowmwW5tnidR8OFj/L2AEdbCpr9DGo4YbgYnU8hAav1axJHUAJPc4CLWyIfwpXvX6tq g5lXjs2CVhYh89xNVoRoFj57qk1J/P8GDa7wiyVYOr2lyHtwsJBLvpKu2hdIBVPAI5dV 7Wfg==; 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=RRRc+WG5; 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 2adb3069b0e04-52394f500e9si3573298e87.508.2024.05.19.06.26.19; Sun, 19 May 2024 06:26:19 -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=RRRc+WG5; 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 7545E68CADA; Sun, 19 May 2024 16:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11E9368B02D for ; Sun, 19 May 2024 16:26:09 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1edf506b216so49067125ad.2 for ; Sun, 19 May 2024 06:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716125167; x=1716729967; 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=PH2WJPZfV04aJPLmHihnGOhOlZi30Sy3JxAR5HmSWZk=; b=RRRc+WG5hXA/NfVSjJjcZG2pzHGo9OOQ3IQ5Y5bbHjfP6mrwT2cqU8cHL7bn/g5mMJ EUsJgHh8Xw0OBXJWUN0e5jnaS8X5PDY9yc+iyXhNTIgxM7B/TKzWGLw40AA+tfPEb9SI Saqhp6v8qUBm/4lqI0P05xxfrfQ1P57Z9Rs42nrO0HUzIqvZi5xVIiO9VrTb2nVj75t1 8z/0Q0J9rhdgOMLKPxLfbr6wu1BIt/GE8yI/HJbrz+kQnStTfLWQvgz/+1BwMJGoJyxK plr0zrW0YorPHD+oox2tTaFmVGkx32TWQ3BbaRK/4GLX1eHk/AQlxNmMn++VDUfDEOFz DZhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716125167; x=1716729967; 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=PH2WJPZfV04aJPLmHihnGOhOlZi30Sy3JxAR5HmSWZk=; b=RqZbge5mtuiWerWITW9uri6DWmETVIi+BeApMQQynEwMGLooOayqO64fPdmh2YTvFk qW4wK+YTnGDTLHLV3vfkRpU07CB7/rzW7ftzGM4IafB6BsRX0zLhIVvZFI5Qr1mosgvG m+2qeMuYsgxyP4XQzh+HuMwd6UBdcTsMn9cGo6LlMRWNCl5JWfE9SOUw3vNeecYXVDJz /JYZgd+q4cpIQdImZb03Vkq6uJJtYYnxo1xW3KAl3NAcYAXlZz89T1T/afZRnwo6NMKZ VBh7xv3hB+sx22/dxVmZvTtt2opXqk0urje6w5WFLfnu4Tm6OTFq+wgZOXo16jq7QTuR kt9A== X-Gm-Message-State: AOJu0Yyc0DzAwtqjMX84KosNIK6+p4kNRe7t4XuMBWcJpI77iV7dBT/B ZV2GFHz5fzBS3mKyx8ktRmgB2V0Or5L7N6NivDC5NeCqNqNugi361PpBMg== X-Received: by 2002:a17:902:da8c:b0:1f2:f9cc:9164 with SMTP id d9443c01a7336-1f2f9ccbee3mr16917905ad.0.1716125166745; Sun, 19 May 2024 06:26:06 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0bf30f89sm190087985ad.163.2024.05.19.06.26.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 May 2024 06:26:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 10:25:54 -0300 Message-ID: <20240519132554.3342-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/vvc: fix parsing sps_subpic_id 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: Ja7mNVzWKUxz The length of the sps_subpic_id[i] syntax element is sps_subpic_id_len_minus1 + 1 bits. Signed-off-by: James Almer --- libavformat/vvc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/vvc.c b/libavformat/vvc.c index 34c0aaf58b..ac3209a01b 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -371,6 +371,7 @@ static int vvcc_parse_sps(GetBitContext *gb, const int tmp_height_val = AV_CEIL_RSHIFT(sps_pic_height_max_in_luma_samples, ctb_log2_size_y); const int wlen = av_ceil_log2(tmp_width_val); const int hlen = av_ceil_log2(tmp_height_val); + unsigned int sps_subpic_id_len; if (sps_num_subpics_minus1 > 0) { // sps_num_subpics_minus1 sps_independent_subpics_flag = get_bits1(gb); sps_subpic_same_size_flag = get_bits1(gb); @@ -390,11 +391,11 @@ static int vvcc_parse_sps(GetBitContext *gb, skip_bits(gb, 2); // sps_subpic_treated_as_pic_flag && sps_loop_filter_across_subpic_enabled_flag } } - get_ue_golomb_long(gb); // sps_subpic_id_len_minus1 + sps_subpic_id_len = get_ue_golomb_long(gb) + 1; if (get_bits1(gb)) { // sps_subpic_id_mapping_explicitly_signalled_flag if (get_bits1(gb)) // sps_subpic_id_mapping_present_flag for (int i = 0; i <= sps_num_subpics_minus1; i++) { - skip_bits1(gb); // sps_subpic_id[i] + skip_bits_long(gb, sps_subpic_id_len); // sps_subpic_id[i] } } }