From patchwork Sat Jun 22 06:24:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50067 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp937618vqz; Fri, 21 Jun 2024 23:33:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJATuM9CEjlEerXsY+mEAaXZHfVF2AuPobJB0hk9SWRJMQHYjbVe98q4RqD95Ovs35lSf/5mGf4jrzf6zCbh5ITQ3+dM0lMAjjdg== X-Google-Smtp-Source: AGHT+IGR9wR1SlH81LpnnF8J4b3UVz8HzBUuRiXKurWL8PYFeDSqG5eExs2KtVeLlBt0DOE9vPow X-Received: by 2002:a17:906:278d:b0:a6e:7e1f:592f with SMTP id a640c23a62f3a-a6fab643560mr672598166b.39.1719037980090; Fri, 21 Jun 2024 23:33:00 -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 a640c23a62f3a-a6fcf54d82asi152698066b.368.2024.06.21.23.32.59; Fri, 21 Jun 2024 23:33:00 -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=@outlook.com header.s=selector1 header.b=ez1EIKyR; 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; 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 67E3D68D8F2; Sat, 22 Jun 2024 09:24:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2027.outbound.protection.outlook.com [40.92.52.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37B4368D87B for ; Sat, 22 Jun 2024 09:24:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HT65wQrKhhI2b83asnoTrjhb/XJhOFqfxHn2rN4wK9aJLXPqNXsdq5Tmii5qNHPVyMSzF5W5E/kqcn+5LLSNljJp4hzWoNSQp5BNQC6aneR9U6hSonW9FB5mEHt65WfJA15O+exoBQOGl16cF3no1+JtIpfgYdAh1cEcTGkZ4A5Mrxcac+8L3DwmRlF1d/r/e4byrfEmyzal6D9/gCcPcH96BH2+YjBQdLfRRJ60Ihqm/pxbdDjbam6aF+PCRjdl3hlS4DqXCu+WGAIaYgqFzMCrP2/ckDGJWIHA/27kLnrz4KI9LSVuvEJW8R2BdrNAbNpQyM1lxRf9t/jYZvF3aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=M37kKJB8dpPvc4r3vUGnpDc76IPM4x8T5bnhxAMztQM=; b=EgNJL508cduPdbnp2HCfOu6GSUpDC1IkbitMfVZkQdav0PWfHeRQOoBVxrw+kNJ0bkGcj8IvhjUe2ohdA1LzcxGJDYQ7qBOgrFkgU2Obcph9xO3NkZOKZSemv418OlhWgAmJhcFKX2DmiCnpbDtUuettmuWIINHypIXeJaQkmMw8sDpcKIcTSXwnI3WLUlLKtmBMbP7ZEld0glLL92Z/5VU0N72FxrWQlErSeXrvAIouoJBy4upomoe4XmeWgUWVjmO2xPpc+UbsuAg8pc4XNEYANAOBx0t3CZd825osjnAPa4srX5fOVD6Db9cWNBQ/l8iGf1+vyy9HSHArUjUxtA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M37kKJB8dpPvc4r3vUGnpDc76IPM4x8T5bnhxAMztQM=; b=ez1EIKyRgq30IGKjEIUCM0N1IZ5n6LxPVeFGRUcqAiYSgpXEOFjyDN7DconIMU66YHNQ7ioL2ybldFc35SnGmS+06pklGP1vCynyzDTw6BYggV19eVDfbMwdGewUXKPkujyknIVvNFcu5YsHD2ZZvsnsveTLtoDvgh1xdY8bemBJ0r5eGRqU/mdMJDIgxXLBBFJ84Mbx/LBbGzqHcipwCmdVTZo25zP5KbK6gogMPSFLjk2Dl+1BLJ6tNYZI4JGFDAxPyxy12Nu6xF4msUzOH2/vHiV8oCsjWFlbnK1UFEv6JSEnHmFA3QpFbJzGzoNLm8WB11/EyHg9PQzWEB48Qg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYZPR06MB6045.apcprd06.prod.outlook.com (2603:1096:400:33c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.19; Sat, 22 Jun 2024 06:24:24 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%3]) with mapi id 15.20.7698.017; Sat, 22 Jun 2024 06:24:24 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 14:24:01 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240622062405.285359-1-nuomi2021@gmail.com> References: <20240622062405.285359-1-nuomi2021@gmail.com> X-TMN: [5XTCRQ4kWROFX+y3Q4M/Q4iFrM2JlJ5C] X-ClientProxiedBy: TY2PR04CA0023.apcprd04.prod.outlook.com (2603:1096:404:f6::35) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240622062405.285359-14-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYZPR06MB6045:EE_ X-MS-Office365-Filtering-Correlation-Id: 8081e4bb-3fd0-41c4-5522-08dc9283f58b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: NKh4eAU/Pm2FQjOxEKIPKItitMEAEFXlr8vmf065VOJjplM+KuzDpEEp0VUPLK19BLuwtfAXFX3D2Y2mxfXjtJwasDDYOcjJHTD2X93WhDkNoaqLU6kvXsFSy9BvNhxjWvmMluEiqkNi4uwI5rzdCmqT/9WYjCEbp99dNvnH7YQZ+sHLnX7+VGYtLC8wr3bLMP3R99PI+ugBrltvbo4ZnP2IgBMbNQWLsAPuRGvCdmSD1X2q8fjRI41F8nQQAuG/hGMzNfuP8jkmZWkEjDyGXqLnNSpd4QP01jZWx/uXANnoNYVbJo282z/8GuI8c5m0MthbG9jHLssP0RMbFjRGlkyIXZQbt81/qHRqg0ooCUVlkHgSKklYhprATLnU4JpbVDIKTe9JD1SteRGB/VF21/MvVRxty+ZmnhKaKFRogoKbmUhaIbx/6Fxfgll/X6Sw77O/gE4RcyVFU0/JcqzBTxMmOIAZx3OPlzJGmON7SOGuWcFQiKo2GCQF28ZxEujb2LCjJEJtvByCNdR+faAEVa9WAogIO0JfMhdPb+qAesQnrUsRwpEtdQlsgOglafmhzyezcBThTzS+ZhwyT5Kxb1lyV88IhI1sV6JIodeKKva36NgWobFDPtN+Q3RrU1Rl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pkJJ346lOs57dS2E39DxTZUBwZDnU8iENNVzemAA0bO18r7jiFTLOLDYNzcB9Ko0mGZuqFJoFN+uBqhBDZy9fAwfUoD/2OS6MAj9EPALuB8uL3ac2zL26HZ81qYQmG07aEP5ykGEv9y9BXD3XyFXwh/M0K5DWEqhrmHO1mIrCypJRWbMc0/YFSzZiX0K8HigL9jYfe9nub0P0wn2sdzRBlDe20UIIG3JggBhQh+lF0oEu5j6njSzDKgfhk+QqrEFfK7f5kTymKV+CoZSNhRy92RDsX6D3FBmbVljjCEP7aPHqEk7jiN2gxvah8K8+eLafN1OF4LsrNfvwVTLfkzoTZIqjA5XGPNai+3DAcIjKFfm51qN5uxXnn5z8Zghu/LkRoncO6GiwaSKc7lRQqI5qUlaKVgQvkcgR5o3HOUIz+kzStt5rZaTOL5SR1z4XA2J8EpnktmYAA0IldCrkkCtD5hjvwYgGUJZFcRkJq/7B/w0YD06R0x5Y6NUdo6hKd72kjBzupNubKpizcESS7T9HtUgo/4uWuFZo07KXK5LD7QJyEISvk1A1qooCDDlIbriSimKk2g1EMyTwJAzfsU5KfAzTHA9WxV13lCrA24s79PnpoGgera0IzT3CtXH4X+qCH5hjIM9fstjBYW1wTt9ZBQ6bEI18h4QnChil+lU/ZH2z1TLcfkBdgO+dELDLnmuPwx80hqoXh+i9wMX0LQZ3Zl+FdW5QBmQldVbGVJM0VXZQQOOjs1foBL1yncZDUMkwvN0yqdTbah7LSGEnvtGAzjyEjYl4PIuo3BjmAhLxeHabw6hl6pOh6yd4c4FyIIahUFjKxvPY2mplIg4WbJdtI/JMp4WrVBx5KgmvmHwKghIlibIYloOn3ni8dvkvJT4B3SGiSqkNBqM6dp4lS2hYCdSK9mKMTVpTdKovgBanHmS7LcGEHpAwneR9L9/rp89YEhvZXwsYhEmByZ+QRFi2oXxTkLasHD4/Q0MtcqhrqPfIKdo3bTDpvT/U5pkVfHPzbJAhOEK8hO6lri14MgS1EGlkvt44X2xW//rPWHNHp3a6CINod76rbE8k/cP7ILgrTam+q49wLhJW/Anq42f7dMM61KI1MGjFeCjXaUwdiy0UGi0vcE4wtNo71pb2D9HgB5lWZ2L15e2skcgV4dbsvYmPpvubJe99OaYYbXR8H7whoHsztSuqN0hbLWxHK0Z9UkRXozvWr7meonlLF0S1mfnwFqZHPOetljBActvE3q2bAeXrzNA2PgnvtvoEhoVvFNsfuwF2dstvQixixMScg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8081e4bb-3fd0-41c4-5522-08dc9283f58b X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 06:24:23.9407 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6045 Subject: [FFmpeg-devel] [PATCH 14/18] cbs_h266: add VVC_MAX_VBS for max num of virtual boundaries 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: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QuyCFNNZxFWX --- libavcodec/cbs_h266.h | 8 ++++---- libavcodec/cbs_h266_syntax_template.c | 8 ++++---- libavcodec/vvc.h | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 21b9a4196c..5f12915b65 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -464,9 +464,9 @@ typedef struct H266RawSPS { uint8_t sps_virtual_boundaries_enabled_flag; uint8_t sps_virtual_boundaries_present_flag; uint8_t sps_num_ver_virtual_boundaries; - uint16_t sps_virtual_boundary_pos_x_minus1[3]; + uint16_t sps_virtual_boundary_pos_x_minus1[VVC_MAX_VBS]; uint8_t sps_num_hor_virtual_boundaries; - uint16_t sps_virtual_boundary_pos_y_minus1[3]; + uint16_t sps_virtual_boundary_pos_y_minus1[VVC_MAX_VBS]; uint8_t sps_timing_hrd_params_present_flag; uint8_t sps_sublayer_cpb_params_present_flag; @@ -703,9 +703,9 @@ typedef struct H266RawPictureHeader { uint8_t ph_virtual_boundaries_present_flag; uint8_t ph_num_ver_virtual_boundaries; - uint16_t ph_virtual_boundary_pos_x_minus1[3]; + uint16_t ph_virtual_boundary_pos_x_minus1[VVC_MAX_VBS]; uint8_t ph_num_hor_virtual_boundaries; - uint16_t ph_virtual_boundary_pos_y_minus1[3]; + uint16_t ph_virtual_boundary_pos_y_minus1[VVC_MAX_VBS]; uint8_t ph_pic_output_flag; H266RefPicLists ph_ref_pic_lists; diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 53c4b60b0d..34b766c7af 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1562,13 +1562,13 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, flag(sps_virtual_boundaries_present_flag); if (current->sps_virtual_boundaries_present_flag) { ue(sps_num_ver_virtual_boundaries, - 0, current->sps_pic_width_max_in_luma_samples <= 8 ? 0 : 3); + 0, current->sps_pic_width_max_in_luma_samples <= 8 ? 0 : VVC_MAX_VBS); for (i = 0; i < current->sps_num_ver_virtual_boundaries; i++) ues(sps_virtual_boundary_pos_x_minus1[i], 0, (current->sps_pic_width_max_in_luma_samples + 7) / 8 - 2, 1, i); ue(sps_num_hor_virtual_boundaries, - 0, current->sps_pic_height_max_in_luma_samples <= 8 ? 0 : 3); + 0, current->sps_pic_height_max_in_luma_samples <= 8 ? 0 : VVC_MAX_VBS); for (i = 0; i < current->sps_num_hor_virtual_boundaries; i++) ues(sps_virtual_boundary_pos_y_minus1[i], 0, (current->sps_pic_height_max_in_luma_samples + 7) / @@ -2714,13 +2714,13 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw, flag(ph_virtual_boundaries_present_flag); if (current->ph_virtual_boundaries_present_flag) { ue(ph_num_ver_virtual_boundaries, - 0, pps->pps_pic_width_in_luma_samples <= 8 ? 0 : 3); + 0, pps->pps_pic_width_in_luma_samples <= 8 ? 0 : VVC_MAX_VBS); for (i = 0; i < current->ph_num_ver_virtual_boundaries; i++) { ues(ph_virtual_boundary_pos_x_minus1[i], 0, (pps->pps_pic_width_in_luma_samples + 7) / 8 - 2, 1, i); } ue(ph_num_hor_virtual_boundaries, - 0, pps->pps_pic_height_in_luma_samples <= 8 ? 0 : 3); + 0, pps->pps_pic_height_in_luma_samples <= 8 ? 0 : VVC_MAX_VBS); for (i = 0; i < current->ph_num_hor_virtual_boundaries; i++) { ues(ph_virtual_boundary_pos_y_minus1[i], 0, (pps->pps_pic_height_in_luma_samples + 7) / 8 - 2, 1, i); diff --git a/libavcodec/vvc.h b/libavcodec/vvc.h index c4cec1eb8f..92639779c1 100644 --- a/libavcodec/vvc.h +++ b/libavcodec/vvc.h @@ -151,6 +151,9 @@ enum { // get near that, though, so set a lower limit here with the maximum // possible value for 8K video (at most 135 32x32 Ctb rows). VVC_MAX_ENTRY_POINTS = VVC_MAX_TILE_COLUMNS * 135, + + // {sps, ph}_num_{ver, hor}_virtual_boundaries should in [0, 3] + VVC_MAX_VBS = 3, }; #endif /* AVCODEC_VVC_H */