From patchwork Sat Apr 13 10:55:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 48040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp779083pzb; Sat, 13 Apr 2024 03:56:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhv4bfNe4uOoEvHPo6YwH9ukx5CLn8yy3RJuxzs6SNcQi6MT3pcndnp0FOskLIdvm3rOUX2rAKXoOlfzc1JFnzTtbiELtulcIivQ== X-Google-Smtp-Source: AGHT+IHcOt9A/G0/mWL83F8PXIEgDM8d87F8iLLDAdsbnhkX+KV6v5VIsdIBLH20hOjAoSyj9upf X-Received: by 2002:a17:906:7ad7:b0:a47:3312:b32a with SMTP id k23-20020a1709067ad700b00a473312b32amr2966431ejo.58.1713005772708; Sat, 13 Apr 2024 03:56:12 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ho15-20020a1709070e8f00b00a46fb7f6c1fsi2639226ejc.866.2024.04.13.03.56.12; Sat, 13 Apr 2024 03:56:12 -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=@frankplowman.com header.s=zmail header.b=PfD3H19I; arc=fail (body hash mismatch); 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB3F368D2EC; Sat, 13 Apr 2024 13:56:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from sender-op-o11.zoho.eu (sender-op-o11.zoho.eu [136.143.169.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C49D968CFF4 for ; Sat, 13 Apr 2024 13:56:01 +0300 (EEST) Delivered-To: post@frankplowman.com ARC-Seal: i=1; a=rsa-sha256; t=1713005759; cv=none; d=zohomail.eu; s=zohoarc; b=GgCnnHLCofr8ukaDAibhu0QMOjbOAiW9+vR+cEnE7YQIqNeNNcoNupvgaNeAIJufVz0swtzHlL6TZvlhxhYeAZX8FC4yKREqZfiSxlZaeDmUMD2m0BWqjelfM6j71ug2EU7ij/xHQMFb8LJ1/eJtFnGaq4AJJbUYLeRLBedwDsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1713005759; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=XXTVURBHmyoNuv9apeb7cNF7WZRDcr3+xaBGCCGEiqM=; b=dpKjF1K3m5epk1+rJ4q5UqgCLHG4Wm9UEz8c15hVlNCf2M8ygdpPEXQ+WrbaYFr4KtBdEdtiP8rTw3urXQWIybCS3mmk/98HC4tQrk/DK9DIiOhInafuu4mUBdHUdwiwktmxWX4ULG9x+UfKA/vPQo4Lwbw0GK97s5bftcy3ULI= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1713005759; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=XXTVURBHmyoNuv9apeb7cNF7WZRDcr3+xaBGCCGEiqM=; b=PfD3H19IJtdF+4ELN0u16wIPsQgxArtiuOBoywgRWUhXz27JIhsK/tFgqOaOvSGk 8kiBQf3opZJn0kxlhvXD3qhN9ud1mKi6wR1XmudSfZLjvIwXEZ88+7no0TPnQGh/C3q Fp0qWehYCujJOJpK8huoh+oH1k28HCxv1uU5w9RI= Received: from localhost.localdomain (78.32.118.75 [78.32.118.75]) by mx.zoho.eu with SMTPS id 1713005756867555.3590937711574; Sat, 13 Apr 2024 12:55:56 +0200 (CEST) From: Frank Plowman To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2024 11:55:54 +0100 Message-ID: <20240413105554.57677-1-post@frankplowman.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-ZohoMailClient: External Subject: [FFmpeg-devel] [PATCH] lavc/vvc: Increase size of ctb_size_y 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 Cc: Frank Plowman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 72MHaq6uiy/v sps_log2_ctu_size_minus5 is between 0 and 2, with 3 reserved for future use. The VVC decoder allows sps_log2_ctu_size_minus5 to be 3, and so ctb_size_y should be at least 16 bits to prevent overflows. An alternative patch would leave sps_log2_ctu_size_minus5 as 8 bits and disallow sps_log2_ctu_size_minus5 = 3. Signed-off-by: Frank Plowman --- libavcodec/vvc/ps.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc/ps.h b/libavcodec/vvc/ps.h index 78f1687fef..6656a06320 100644 --- a/libavcodec/vvc/ps.h +++ b/libavcodec/vvc/ps.h @@ -69,7 +69,7 @@ typedef struct VVCSPS { uint8_t bit_depth; ///< BitDepth uint8_t qp_bd_offset; ///< QpBdOffset uint8_t ctb_log2_size_y; ///< CtbLog2SizeY - uint8_t ctb_size_y; ///< CtbSizeY + uint16_t ctb_size_y; ///< CtbSizeY uint8_t min_cb_log2_size_y; ///< MinCbLog2SizeY uint8_t min_cb_size_y; ///< MinCbSizeY uint8_t max_tb_size_y; ///< MaxTbSizeY