From patchwork Mon Aug 7 15:53:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 43163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1693821pzh; Mon, 7 Aug 2023 08:53:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdN4LQ3tmqU5L5EIozQ4LiQuS1AHL+u5m4NkKOa8T97+hu+gi400e5W2Ty0WsauGdiQDqr X-Received: by 2002:a17:906:76c8:b0:993:dcca:9607 with SMTP id q8-20020a17090676c800b00993dcca9607mr7522356ejn.2.1691423636996; Mon, 07 Aug 2023 08:53:56 -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 hk6-20020a170906c9c600b0099bc57f3882si5881015ejb.369.2023.08.07.08.53.56; Mon, 07 Aug 2023 08:53:56 -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=RK03laNl; 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 8F38368C5ED; Mon, 7 Aug 2023 18:53:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2082.outbound.protection.outlook.com [40.92.53.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEB7968C4AC for ; Mon, 7 Aug 2023 18:53:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TS3zXkzHExFI41N1GrUWtq+3hzJqsodc6SAuX02ZMhaBkUFInRFH2HluvSBje7zf3BtPWSZ1IiudwPuRa+yTcDb9XgQ9drSIBlhm27gDpenaWOM8wHGrpvCEz+fgKZFlBbX/U5pBuyf+8ZtzEcfrfB5LZ7Ou9TrMfCtvi6IaqmzVpQ6LUhsrIHxvuBQxhEV59LXEqfP7JfIv+JW5C+cWym9YQ0GZhRu2QrZzrGpwtDV+U/N5oMhiXsr1rbT6Nh+DTWn5IoMWK8mkVGd9cTysvQU0lsk4p3/O1ki+pe7jqRS67ecJwEXN4KgCUCpSZTEMslhiZJDxW0vz6H8NvxQoIA== 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=QmL1qmWuRpmApOTlWTu7+OqC5FAPL/3nEB0sJsuHbcs=; b=kObE4+HD5jfHSlcajyhvFROYjwXuO7xjH0hyANZr+LH5213UD4mMNxN2dyZEQ+dY8+F4YBCPQVXKK329Poklj0A7RsiPHGauW9nUe9jOP/KAFkuwNq8JGgTlLiRk6lGx6Y7VLfzxiZGWaqJYIfLJGYp+Mcj+h/Xa47aIE9yu7mBxEW0J71ur8wA5PRhR6dfpccgLTrTEHHTaoNxQawnWn980pEmddbgYXX3M8kMXxldPk6FFm+ahBUlGOTcfwwTsjHZTu1XeW+rkvjIKA7KIQrKcYU+iAIwDWAFsqPUZzB1eTRG1r2vcoeVFNTNGKjkDOolXgDC35tfyLXtGh3ob5Q== 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=QmL1qmWuRpmApOTlWTu7+OqC5FAPL/3nEB0sJsuHbcs=; b=RK03laNlIH2c5WhRxuJuWK+I6pL+mIJR4J9x8E9HjqERZJhphxJGnd14nUE9KSOpJsuyDTkaHstfDMuzl0DlEnMj1V9u4G5zq17ZfZwadiThYEmH5IDCizT4OIznnVDTpD+Cbrfy/dWTu6G1nOsYXuNuNbJkz9Fi9fUvrajnd6kShsCa6mUJI/Y8exq52HuWumptIqNx13Sdfopq2ZpwTnLptHJSpKJvp06r9A0A3KGwQegfLntw7APCWIYEBGSERqbMK+cquEdev8rd673JCofSbZy3FF6Ji22DR5MDU/lJu6X6DnB6GKpC3dvqwFiLYNieb29onItAj6215jr13A== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.22; Mon, 7 Aug 2023 15:53:43 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31%5]) with mapi id 15.20.6652.025; Mon, 7 Aug 2023 15:53:42 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 23:53:39 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 X-TMN: [M57N1FXIDLlGSxN8J2XJMgneKPmIDNSJ] X-ClientProxiedBy: TYCPR01CA0147.jpnprd01.prod.outlook.com (2603:1096:400:2b7::12) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20230807155341.21438-1-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ac9c9fd-6b02-4230-cf0a-08db975e79a0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zi1rs9NPkk2VIVkxobVo6azoJIKmP+V1f0ykrOGi3vuAElNfhr5seUA/FT/P9U3AM5YN2nixBBvt5AJtHS+hnxjAJf9lUg1gXFIfyLLP0YwNLj++w/2igX5AFY7jDjhmV7L/cVl3QKfz8TgcL1k5Hyr6wVMCDKHK0Gtt9x/1riE8VSfZNni05V1gGmHQ1eKbSUP9lEU/O3buEktkzt20lEi7KjK+sTY2qiU/PNFRe+lFac0KHks+xeaPsc5PbDcJNs9FdQImRBXF23//+LN1fxYGo7oIIluktIYqEfSJRFffIWcpX4TDyMY/4NKGCdM7QcQUQaW6uqbclqeuLEyZAz+DbSqP5lUPn3uGamdUXsh8QKMAlyGCeCA5qxmBmBYE5h+fPgWBhCBQk5gV52tc3FYITodjyALQYHKViI9CDH9RsXcEEAOXmhT1d0R2q/S1BqQJR/RzsQfWNKnUXnu/oEqV6W08qW8gOX1g99JQ9KGUeScMOlvhXqqOF35V4doBxFNlh5KsI9Bbw25yZgFjqtpikVlYnspXvsbNYr7Bn7qPWxQNlEWlhal9u6JRu4+ek8jF3f91EtkH8uiN73ewZMnnB1MlZ6lvrSgcvsmxZzqD5tM1bFRsBf9WY/sT29ev X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TlohE7aN4uIcRud1uT3Kff3AgTUsFKfGYlgctwekxdCow1XDOrLIel6Xd189pwm49Tf10ll4IEIzexhv5UnMbjhdtJJOA57BW5hu0LK1MmuQzknZ1SqBHMpuXgZnsE+jHEA1axQ4JPRcDoezrzSJtXhNYUtPAvlQ9rgtQb6vMSoapz24FyA4BEMEwXrTmXlgsBmAO5Il2bpxNqGeqpehZ6zhogJdAu0VJ7bJomJf4jFTfA31Vih0oxFv7naj5XNlohgaKVEWGvKHGqpjZS0XxqMtbyMqjKjb4U5qKZt1jK3k1hLywTam50MbWG8z8o5tQBzr1CKBvploPU4OSyC7N9yF6uab/qjRsoQykABcRVcHsCApsZ1tjIACcisrIbt8J+NcD0DQ5YtBrI8Ktdoz/2A3p1SOiTAMxGNg/2+en/oQAjXn/aoi5OmydwUrffi/Zg9vqFLIbFbXziCNSXzjygAUp3t4nNy+UiSfbHI+k1Rl7wzaBX/tEaMSA1wSySXtLwKZ4WcY3KO8UkvZp4oeVWdyzl4xC9tZ9Te9pCvpDDiUeOISAEVplt2mjagzlOUuCQk1WfR04gjdkB8daLCLF2ZY02SZGcuYPHmhUpdQwLmgBXAo3n8pLLDnywnsYnXCAMzkIF7Cot+RcXFUi2mf6eHw6325H9RS0XJEN+jG00X0bneLhxb7f6sPyrGct/BsqLnpvNaI76UwB+vK2bBfamlwn7HRF8gWBtjaYjUYwuQQ/JXInOONmy3mpenDGw6DX5gTgmHaCIADTpnAXawChZXFgrx47b4d7P+wvAKbpxC0iRJVxpw4Vx7+NXR+9THaYarsAbldj0v4K0AB1XOt4o0dVWLqxd6XCp/ejALYkZuB+cdbBfeD+JdDCfBKKuEKL4fXqmeY0Lxrt3mwPpnZz9Bcpmb1O4OQe4R1Vu7Lxg0f5v1GY/DLCziX0kGfMuJaDiGeLGyHVzZNiqzqmM40MYSNb5x+np4rjaMsHzrskVf/9EnWaHV/BIz+bHXXjVGz7GN4a20hsYL2RBaUJqzgaV69sPCHmkOR3ZJseOGoaY6QjJKyyaA+jlmHsExCuaRG3/xXsbkwKAimvR5+9DIabj73YMp4pR1oBOngf+bxazE6FQARu5T55JqWHPew6133ZkchGhZBxIAtJcLIlzdxykT7Kfl2D1QFuXQlpyO8fQqIVug/FHY6/2kuSTPZiesctiHKkkHuT2Wi6uratAIqFk9ESlMxEUfiStEJGD/WeCwJfHxUrINSHUo3s84dW92i X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ac9c9fd-6b02-4230-cf0a-08db975e79a0 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2023 15:53:42.9043 (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: TYUPR06MB5873 Subject: [FFmpeg-devel] [PATCH 6/8] cbs_h266: H266RawPredWeightTable, expose num_weights_l0 and num_weights_l1 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: 5p45N7tH3VE/ --- libavcodec/cbs_h266.h | 3 ++ libavcodec/cbs_h266_syntax_template.c | 43 +++++++++++++-------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 1d80c74feb..87a2d02cfd 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -666,6 +666,9 @@ typedef struct H266RawPredWeightTable { int8_t luma_offset_l1[15]; int8_t delta_chroma_weight_l1[15][2]; int16_t delta_chroma_offset_l1[15][2]; + + uint8_t num_weights_l0; ///< NumWeightsL0 + uint8_t num_weights_l1; ///< NumWeightsL1 } H266RawPredWeightTable; typedef struct H266RawPictureHeader { diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index d0d1ccadd2..501c066faa 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2507,7 +2507,6 @@ static int FUNC(pred_weight_table) (CodedBitstreamContext *ctx, RWContext *rw, H266RawPredWeightTable *current) { int err, i, j; - uint8_t num_weights_l0, num_weights_l1; ue(luma_log2_weight_denom, 0, 7); if (sps->sps_chroma_format_idc != 0) { se(delta_chroma_log2_weight_denom, @@ -2516,21 +2515,21 @@ static int FUNC(pred_weight_table) (CodedBitstreamContext *ctx, RWContext *rw, } else { infer(delta_chroma_log2_weight_denom, 0); } - if (pps->pps_wp_info_in_ph_flag) + if (pps->pps_wp_info_in_ph_flag) { ue(num_l0_weights, 0, FFMIN(15, ref_lists->rpl_ref_list[0].num_ref_entries)); - else - infer(num_l0_weights, 0); - num_weights_l0 = pps->pps_wp_info_in_ph_flag ? - current->num_l0_weights : num_ref_idx_active[0]; - for (i = 0; i < num_weights_l0; i++) { + infer(num_weights_l0, current->num_l0_weights); + } else { + infer(num_weights_l0, num_ref_idx_active[0]); + } + for (i = 0; i < current->num_weights_l0; i++) { flags(luma_weight_l0_flag[i], 1, i); } if (sps->sps_chroma_format_idc != 0) { - for (i = 0; i < num_weights_l0; i++) + for (i = 0; i < current->num_weights_l0; i++) flags(chroma_weight_l0_flag[i], 1, i); } - for (i = 0; i < num_weights_l0; i++) { + for (i = 0; i < current->num_weights_l0; i++) { if (current->luma_weight_l0_flag[i]) { ses(delta_luma_weight_l0[i], -128, 127, 1, i); ses(luma_offset_l0[i], -128, 127, 1, i); @@ -2546,28 +2545,26 @@ static int FUNC(pred_weight_table) (CodedBitstreamContext *ctx, RWContext *rw, } } - if (pps->pps_weighted_bipred_flag && pps->pps_wp_info_in_ph_flag && + if (pps->pps_weighted_bipred_flag && ref_lists->rpl_ref_list[1].num_ref_entries > 0) { - ue(num_l1_weights, 0, - FFMIN(15, ref_lists->rpl_ref_list[1].num_ref_entries)); - } - if (!pps->pps_weighted_bipred_flag || - (pps->pps_wp_info_in_ph_flag && - ref_lists->rpl_ref_list[1].num_ref_entries == 0)) { - num_weights_l1 = 0; - } else if (pps->pps_wp_info_in_ph_flag) { - num_weights_l1 = current->num_l1_weights; + if (pps->pps_wp_info_in_ph_flag) { + ue(num_l1_weights, 0, + FFMIN(15, ref_lists->rpl_ref_list[1].num_ref_entries)); + infer(num_weights_l1, current->num_l1_weights); + } else { + infer(num_weights_l1, num_ref_idx_active[1]); + } } else { - num_weights_l1 = num_ref_idx_active[1]; + infer(num_weights_l1, 0); } - for (i = 0; i < num_weights_l1; i++) + for (i = 0; i < current->num_weights_l1; i++) flags(luma_weight_l1_flag[i], 1, i); if (sps->sps_chroma_format_idc != 0) { - for (i = 0; i < num_weights_l1; i++) + for (i = 0; i < current->num_weights_l1; i++) flags(chroma_weight_l1_flag[i], 1, i); } - for (i = 0; i < num_weights_l1; i++) { + for (i = 0; i < current->num_weights_l1; i++) { if (current->luma_weight_l1_flag[i]) { ses(delta_luma_weight_l1[i], -128, 127, 1, i); ses(luma_offset_l1[i], -128, 127, 1, i); From patchwork Mon Aug 7 15:53:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 43164 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1693893pzh; Mon, 7 Aug 2023 08:54:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFLNcgg1+CJPQULwPixcbnx56b8rbzdkW0pPHmmXFCje7lpXdfSWoQZ0F/6tzh9U0Z1XMl X-Received: by 2002:a17:907:77d6:b0:997:beca:f9db with SMTP id kz22-20020a17090777d600b00997becaf9dbmr9652816ejc.54.1691423645479; Mon, 07 Aug 2023 08:54:05 -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 o26-20020a1709064f9a00b0099bd03b30cbsi6084943eju.627.2023.08.07.08.54.05; Mon, 07 Aug 2023 08:54:05 -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=AZL5rNLz; 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 8368168C632; Mon, 7 Aug 2023 18:53:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2082.outbound.protection.outlook.com [40.92.53.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38D0C68C602 for ; Mon, 7 Aug 2023 18:53:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TKDVbvZjbXs26GD7/mAnWJB3dZ8nLvcjAzRMVABdxrxdzs1Mh5dbpR6dX+KJI0urCjhqXq+qSfDa1qXcfdwuqfiP3JKlFwF9KAuY+fziYf7c57LAPOVqIXGtBlvndp0YpjOs2H2I54Q/WfDgKQ/JQuh8Mcw1SmncI8HNiPkCsMmnX4tQX3k4VqjnegdL3qb2qQKa8/La+y+4HI+hNEaN5ta0l2uDGSrg+pBFiS5OIGxYIx7wR07iphCPDaknRfUXzG6DvXIXTsK1JKfYuXDYjcbCT0WQdLYo+NdYu5yAnOciRpomtkKompAtGYB373t/NkctNBpu4XDlE50bDcA2mQ== 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=Vfn/cbZTXcVvR/Gl3KPirfhKv9plSEMPck6n5XvAoO8=; b=jIXDlchoz46WcbEuIBYldbApSnjJ6n7igMpZ+fccmdYA43tevBVo9zs9qL0m9/+3na2TWFUZyS9bWvbgGqD3Ao5GmjGFe8yVXhghG+3LY80Mac8A7TIvZXVtMzqKhuCOSx7nARWKU/MVE5w1QzygpvsVRHm2ij9cz7tx0Upm31ut6lDw8tw6hOOHQ7RqRS0bgUZfPd7tWVMbNLGOevNU0OSlz7BbkyUY3Wu417e0n1wU62xquBePjzPnZyIGGoGXAZHptpMBN4lVvl7LmFgzch5feFQa+vAp2lUtLMwTj69wb6PsniPc1COvtid+AJ/+9soxMEhEKHK2pH0/OXAwzg== 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=Vfn/cbZTXcVvR/Gl3KPirfhKv9plSEMPck6n5XvAoO8=; b=AZL5rNLz6A8WJPWxg2ovWMDHTc2B/fqbl4sI3D/M8VGDQMrwe3jI+nuc7Gkv7o340LzcZeouZhWHxH18oeq/XkH578QFta5RKMaEy3G3zyzRK1fI2C1cSuKIWyjuirCdkvlFX2nbSiCJ+jr4VoqwNl99oPRk2/7mPefpAWZDYchze//OoFo7GHEtsdLsP3OdZLxUXcX54GkfLdfzPaynFPZ3LWkIC0kmNO10GdQQlir4qCl0rkX4IzVDSP8LtjUvup6uOcm3zBrV+7bZ7FCuVUB1g7BAJeuxQDcSLRMf1ZHi1vlU097S0afQO5DDyBBuTSyzBk10KDUrT9BWXiQi0Q== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.22; Mon, 7 Aug 2023 15:53:43 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31%5]) with mapi id 15.20.6652.025; Mon, 7 Aug 2023 15:53:43 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 23:53:40 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230807155341.21438-1-nuomi2021@gmail.com> References: <20230807155341.21438-1-nuomi2021@gmail.com> X-TMN: [fmw13GgEzhPXctTOELCNHvL/va+jcJaS] X-ClientProxiedBy: TYCPR01CA0147.jpnprd01.prod.outlook.com (2603:1096:400:2b7::12) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20230807155341.21438-2-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: 8789dc73-65df-4d7d-a5bb-08db975e7a15 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sRlxd+Gn84xnYtih/5icCmqmtvQ4TXw4QXZWLQAmq04u16fwEb1GcrARS4YuQTd2N+V0vOr6yhcjD4LpheSwWMXs3GDfhPxT/8e/eHCt3dUN7dH7rglLnXuS96YlTWih6IM32JVWtNBDV3MnkTCxNqsIFhHdDPn0yVjMFnzxrgvaf4K1SazuVW/ALBZoduu1RmTjJjehWgyEn5qeFJgWRpI3G9i7WBDFEOoBq+EZdEkIEJvqyZ8gB04WGvm9uAYxqggjnkihrJaH0VzAWamInt1Le/wr8Xsccowxh2XkrMRS7C7e4oHIMRmWQeZrZjs/14krrVNunklbxjM6w/QDqNLTaXbHctgpMmfn0pIOiPddQFeInQa7Ip5Xxwua+DD9u1ofI00kbNqaxvM7p1aTWuUFVGQSOAJe6dDUgMDfrZuedG++/uk3BfZ9ajPMPR6kjrHk552o7RIC6o6sAaYQC4nBakc5PuzbZogUbecZOG1+BLeXqstfmSpoh41+rEpbajDRtB2ml1IHNzTiGuK2+Sn4/EXMqboPLpXQ3fhzdy69xG4FhyLP6qCy572MhXXe5WwgQnKdv9stXEHXAtL5vdlana8ijOIRHp7dSFUCW0gdPWtbVJk6Ab0LZqxuVzHJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lo7MmvFyN3D13ssaycepK1kSiUN+iVDOZ4Wf/tivr9r36ESL1RWs/50S2Dj8GyVAPBP8tqjxui77Ap1xrqq55Us6a5qyTKbXj/U+c6h9SUuu/UQlRU8BPSUSskmmaxBXVH97vF4dC4wwmKAodS4jeem3jUhMQZnKPnfdb2YsNgvqvKzv2phRiFzuen2m4cxzAUBlPvvB6DrsuJaQbWbU8Qjx5oeDujWcamfyCRDRCftWF5UgLCmFRSVVecw2RoEm6UGdKNGpaEgqI//55e0d7vg+tt+EInhWGlt9AtWvVykSRjpY1wK9GrcSIx7lJC9l5Uh79g/9N+DRTVZGbg9psjcLOdZchJ7LIDYVbbqOOt51qNcUMpHfn5pr6hnGCcoyLbB3ebz2cViK03ng7gcijtrm2U/9MSBUEoCWgXE9CjAcSZ28Uxdhtoemh/OMOddLrZLO21/aWoHUQ7p3ISrO6gWvlZsy9fD/1HadTzBEs219Dk9kD/ViWaPht+Jf80jjyA4hjPOk3l/gN/g2GEo5bWzVJSuwzmgFB+RLzBV2cZ1qyiwbA64UPLWmPmlsnrMTb65EvqEJmDKe60BUaBeCKgTqHCgKigko1lHn2BeAD51BUsrbpd6l62aV7XadtK7jvHgItTUsPPh0k99xQd/gtwsMYBKOFEz3i15xf5DPlu3emkz8yhC+0212RwmLxTytFgv7rnbwisf1cS2kxK8ZsE5s0oCWB1xlF12d/7tR2Q1SGB2+UCo/NVrNWnQupUmKLT2b/RcrfZ4zMweWOz4v53if4o1bLYdY6j2sVsbVC2P4dTST2dEcrPWvxMCG0LDkuEiM8PXz3R64ErYAiHs+Ki6P9aKLw2qwTnDRkj6h5kDHhyItUlqrb/erl8mcJPLGGGQ3S7P0zPlVxweQi4XshD73CJ44ADh4AmHScN94eA63pk2VF9Z16RtAiJiPuMdtkIhumgpYAd+RT8FOOL7mAr6O0N3kYm5t+gPc0z6IPTroEMGwx9a9mtx0CTZp4CTUztHBqJ+9sUpTb2w5xjv8Z0E4L9cgagcmY0gKd2db2QHxa/rQbOeUyghQXZLuTaOzd4etRBh/M+72Rd7jWs4pUoI9C8fFyMFAvFCf4w35rGuqTyUGR9UDAGbSehlBcBpyiXcCsFYMaBgxkd6L9Tpud2fgFe9kS3KFI+zEJV6cgQdkRuWq7d/tm3gPBj46Cu0OY+L3VqivOj/UdS5jhLmKCNJhSGNUsT4YPiXUsM16XFk/gGQvC6zx7BOk+1/lzCNg X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8789dc73-65df-4d7d-a5bb-08db975e7a15 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2023 15:53:43.6689 (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: TYUPR06MB5873 Subject: [FFmpeg-devel] [PATCH 7/8] cbs_h266: H266RawSliceHeader, expose NumRefIdxActive[] 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: mSHOv40B44Ww --- libavcodec/cbs_h266.h | 1 + libavcodec/cbs_h266_syntax_template.c | 41 +++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 87a2d02cfd..3a6f6d96b5 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -833,6 +833,7 @@ typedef struct H266RawSliceHeader { // derived values uint32_t num_entry_points; ///< NumEntryPoints + uint8_t num_ref_idx_active[2]; ///< NumRefIdxActive[] } H266RawSliceHeader; diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 501c066faa..b26d7c1a72 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3191,39 +3191,38 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, } else { infer(sh_num_ref_idx_active_override_flag, 1); } + + for (i = 0; i < 2; i++) { + if (current->sh_slice_type == VVC_SLICE_TYPE_B || + (current->sh_slice_type == VVC_SLICE_TYPE_P && i == 0)) { + if (current->sh_num_ref_idx_active_override_flag) { + current->num_ref_idx_active[i] = current->sh_num_ref_idx_active_minus1[i] + 1; + } else { + current->num_ref_idx_active[i] = + FFMIN(ref_pic_lists->rpl_ref_list[i].num_ref_entries, + pps->pps_num_ref_idx_default_active_minus1[i] + 1); + } + } else { + current->num_ref_idx_active[i] = 0; + } + } + if (current->sh_slice_type != VVC_SLICE_TYPE_I) { if (pps->pps_cabac_init_present_flag) flag(sh_cabac_init_flag); else infer(sh_cabac_init_flag, 0); if (ph->ph_temporal_mvp_enabled_flag && !pps->pps_rpl_info_in_ph_flag) { - uint8_t num_ref_idx_active[2]; - for (i = 0; i < 2; i++) { - if (current->sh_slice_type == VVC_SLICE_TYPE_B || - (current->sh_slice_type == VVC_SLICE_TYPE_P && i == 0)) { - if (current->sh_num_ref_idx_active_override_flag) { - num_ref_idx_active[i] = - current->sh_num_ref_idx_active_minus1[i] + 1; - } else { - num_ref_idx_active[i] = - FFMIN(ref_pic_lists->rpl_ref_list[i].num_ref_entries, - pps->pps_num_ref_idx_default_active_minus1[i] + 1); - } - } else { - num_ref_idx_active[i] = 0; - } - } - if (current->sh_slice_type == VVC_SLICE_TYPE_B) flag(sh_collocated_from_l0_flag); else infer(sh_collocated_from_l0_flag, 1); if ((current->sh_collocated_from_l0_flag && - num_ref_idx_active[0] > 1) || + current->num_ref_idx_active[0] > 1) || (!current->sh_collocated_from_l0_flag && - num_ref_idx_active[1] > 1)) { + current->num_ref_idx_active[1] > 1)) { unsigned int idx = current->sh_collocated_from_l0_flag ? 0 : 1; - ue(sh_collocated_ref_idx, 0, num_ref_idx_active[idx] - 1); + ue(sh_collocated_ref_idx, 0, current->num_ref_idx_active[idx] - 1); } else { infer(sh_collocated_ref_idx, 0); } @@ -3233,7 +3232,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, (pps->pps_weighted_bipred_flag && current->sh_slice_type == VVC_SLICE_TYPE_B))) { CHECK(FUNC(pred_weight_table) (ctx, rw, sps, pps, ref_pic_lists, - num_ref_idx_active, + current->num_ref_idx_active, ¤t->sh_pred_weight_table)); } } From patchwork Mon Aug 7 15:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 43165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1693982pzh; Mon, 7 Aug 2023 08:54:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvuIDjdNqGk4BvhsyTZgxefabM/7EmRFhhY74Cig9cJ7FmjkjxnihbdnggmLPB/uiXgJlS X-Received: by 2002:aa7:c0d2:0:b0:522:d801:7d07 with SMTP id j18-20020aa7c0d2000000b00522d8017d07mr8006609edp.10.1691423654278; Mon, 07 Aug 2023 08:54:14 -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 l26-20020aa7c3da000000b005223a5df62asi5929288edr.198.2023.08.07.08.54.13; Mon, 07 Aug 2023 08:54:14 -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=BsEsyYa4; 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 847CF68C63E; Mon, 7 Aug 2023 18:54:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2082.outbound.protection.outlook.com [40.92.53.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B584068C62D for ; Mon, 7 Aug 2023 18:53:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZJzHaXRtu6Lo81SAAyc5W9H20hnimQg5rtixjFmDycWsKQRrNfS+/YOT7NS6Cy0UHXSknqdjRpLG54jP3GT4kLm3KoelBILnypUMoWD0flff4tMN/Cbul6Fb9F+UajKDMN5Q9DYt19gWJ64weT2S86H0sCaRC6DllTu9TMuDOwo08wYBjdo6Z3JlY9FeyhfScIFzz1z/VhSXjMtCVoTTOqb3YMqpZGmGeFNogevYSclnlFw49HQpJvDOcHQYhHpAZoy7TgQxbheN+69l2wbZu19pcUsZxnFRuBLwTcN/l0jTwfKdocxSxfQ36+tdpeucsYjV5I3K6L4uaPiGAR348g== 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=oBY8WidtNdbdek4hnA8YnJRNnKgh2OQGQf0iw0Z5AxQ=; b=Jd2gfHI1Y+UDYRIaLQMoRuLionE60OFlwKpmsR0XogJWzJmJgMRrvfjr3LccIssmm+R1WWX80e5xehq+oXFtLAQrp8S6g4bSsLh96yW1SlqW9PIwqxTcsAs9l1f1sBNH0LRv6xbMkfCKMV+C8yOjzGx2m/BTnKK0sixJShzS2KmjMN86iIgegZ14H8qgDcF/zbLTIZ8RbqJfz09Ultzxdmav1bn4fDHWK9/Nk/xpLbKlQnm6rGck47QbJ1r8/VPklvb9Kw9/jq2aaE3UfBDwWPFr2wZpkpECcTavKBlF6qya69bvOEW1jVbuuxmZC0zw0Gx1jg9PqT2G72xWpFSOXQ== 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=oBY8WidtNdbdek4hnA8YnJRNnKgh2OQGQf0iw0Z5AxQ=; b=BsEsyYa4VoHHSJPdZSOe3QP089QN/VZmjwqxq+Waw5f7aUFTYEnOSoux9PpCBPe8QYkvtTdtBndhpJRJD05jJiIUg45Ls8Goit2lD7HFalZQwbrSWuIum2Z3y0s96f1z5lNm4CGyD3qZJKOjHLXX2LYpc1y3lQmJHIGu6cgxmo0gNMLLHNMNUyUakENiGFbtzdPNLYxhLoLP0ceOqvHDJpibbuMDl/9TR4vUFjRfkOA10errqQfaJ0HrbOEmjq5F5ZEE1ZRw37O3ynmYxn10Ep0eIMbAM/w0zuD92pRnGrrPqVga61iraFvzPvk+00e6w/1XZi1/p28lJa6KWNd3xQ== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB5873.apcprd06.prod.outlook.com (2603:1096:400:345::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.22; Mon, 7 Aug 2023 15:53:44 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::f1a4:bbff:7592:ee31%5]) with mapi id 15.20.6652.025; Mon, 7 Aug 2023 15:53:44 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 23:53:41 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230807155341.21438-1-nuomi2021@gmail.com> References: <20230807155341.21438-1-nuomi2021@gmail.com> X-TMN: [Ms0HJ9zwlPprNVYQQyrjcT7DEwCpQHDj] X-ClientProxiedBy: TYCPR01CA0147.jpnprd01.prod.outlook.com (2603:1096:400:2b7::12) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20230807155341.21438-3-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB5873:EE_ X-MS-Office365-Filtering-Correlation-Id: e4cdc004-1031-43ea-1a0d-08db975e7a88 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /qLQYdiSQ+XhBgesEC0GgH7DQ59JWrCbl4NJCydHciMRR1gPXY1XLxvcn5oE0qcrzcBVVaCOZawdp9Vt9Hou0Z6B41IWRYBPCvrLWuEF04eTHj0nROZ0KLGLHHkgPSxLFJxGJoQvg9ZJQj6MqvnlnSLBeMj2Ughf9vU8tYmcuQcfg9Sm2mriU9m8e5bs1ZNhii7LXYSIKYv4a46CFxCY65FWqmUnwG9i/Mei4BOYs5wTD/5ddtpkzPyUObr6uZvYMSRBa6tbBSVyL71aORFjIsdrilcsuKj/CFnc3+6VV7SAtW9y2qHDrBzHwj966RgRuXXaPTueXrjMyvRewjo5WZwnH1m32DWOcCZdyQr/npr9e71HmDwzU1tyH0xVxl6DMIsxEqfU3yatbRQ0Bh+t46hKZWyqDrgFRbTJBDCbgHO6KlYLirITSwVPUab2GkWX2/HH/9omU+Ib0kuzx9N4LQMmVs0uevnaxWxaFHWieBWpkDHo9+k/XrLha7oW/kl0S8yrcDbpfyIAsPwxXSDzzj5b2YWwqS6aoh6GNDBmK9KSFm8MxqNcILq/8Evlrie2NI303kbEi0nAsTcwnmLT0zLLJr6mDwjnbb1f4Y4F+2qdBSIP6DSB1rwodmmjJxKx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VdoDOFOtetOGHJXNi+hBgn9HLYYUUbtkzKgaeFG2txuJnlQgXQgs8nqd/pWfDyD3f3llVuWLPlYh2rl+yjyYlEBUYLE69Ta1BSIT3dbkO8iNsw25/e/hSeei/0l4kI7HMU/4xTlUYrAqU4lerL+Yx8EDzR7jX1Q6EtyA9m26hCx/XNr/Kua3YG1w0MZVeDURjpsrxRIueXhBRgP9/87Jxcoz51lGQO72I4qjbCokgIBt8AB2VYsVx/HW9LD6h7ReD22wrjZly/nFG8ll8D/WsQlt2Ohzz4YdrLEwRPGbB9hxjdKGoiIlVHB9XOTJPF7Zb0NjQjoQDqM68U5rhcbOIHOHC0x18JkenCUzm4aTBf58uG/ZNbnS+uE121v5+Lr+b3tcPUwCAb1Nx34RPfM8nTnw/EWZfxbBy+ZRs41aVuCyqWMd4hSdrGRGmImoD4F03A/slHneWn2dIklMBUrQcAxxB+14ZI6O0LZZpiMUWcSLWMVYZNV3yDHtcfng8XjYvx2OrdjHTW+I+FSt2noVWKUhUKNoG+PlOWc4mw8eeUgHi0Z/Tb3u8Oih+XB3ABNo5RSvTQ2Yc7EdAc8TvTqRkhIPqrJHoa8S7vVVln3x98zzfjuNS+Ju3JFWXdWL5cm8uFPYtevfeS+OvcaeBHRyhp7XA/RKjDCdaa+2AED+xV6yssVQcdvnutnTR0haklERwPOzIJSRmHXvS+Cca/+EbiSVyfrJDwXcsY7PvsbeFaIKccIAFFA16yo91hCIVuNgcy9c7CLDAcEDC/2kDIpMsPHJKnW4ZYRaVtAwpkhFDzN4LBgSEyN3vzkW3Vtt3FgTCS5kQORa3Y9DHWUBudkDhlLY18tF0b94stQeiEgjeipYn/SmzvXgKMVXnuUMv9nQ9mQdX+SyMNdWmvKRIvSgRqLe1poKcBeteqJBB59BRgQF0u6bjYA5ibJLeGRtGAnj/vrvVPyK3e/WngdJVUeHPRIf3dIDUAv/qPfGTU1N11Wzh+QlG35znVSyoDA4HIDqRRUt6rUS7n5K0FuNG1bZN3P2L5Ekgr2ffpidMX1Emzd2NlOxQknsBnI7MaTrmy3OWHV7knaT5Uv6rhTYLNkFMMFTsNiMmx9uoBoyOFLVsiLlpyGh57X1gFLcGpflQCeK2ZM6d+Jz7em012KBN3grf5qkqsq+Phf6Dy2aze44w/GqQcFrXl+3ruE11145j7L5v4rvB/Z1RASYiih7mHZ/yYUCkNR3UxEkQ6mLipZT5tBWW5qf7dcXxNL2DHaKfNPk X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4cdc004-1031-43ea-1a0d-08db975e7a88 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2023 15:53:44.3938 (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: TYUPR06MB5873 Subject: [FFmpeg-devel] [PATCH 8/8] cbs_h266: slice_header, fix inference for pred_weight_table 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: 5u7fUK/EstpW --- libavcodec/cbs_h266_syntax_template.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index b26d7c1a72..4075897b9a 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3226,17 +3226,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, } else { infer(sh_collocated_ref_idx, 0); } - if (!pps->pps_wp_info_in_ph_flag && - ((pps->pps_weighted_pred_flag && - current->sh_slice_type == VVC_SLICE_TYPE_P) || - (pps->pps_weighted_bipred_flag && - current->sh_slice_type == VVC_SLICE_TYPE_B))) { - CHECK(FUNC(pred_weight_table) (ctx, rw, sps, pps, ref_pic_lists, - current->num_ref_idx_active, - ¤t->sh_pred_weight_table)); - } } - + if (!pps->pps_wp_info_in_ph_flag && + ((pps->pps_weighted_pred_flag && + current->sh_slice_type == VVC_SLICE_TYPE_P) || + (pps->pps_weighted_bipred_flag && + current->sh_slice_type == VVC_SLICE_TYPE_B))) { + CHECK(FUNC(pred_weight_table) (ctx, rw, sps, pps, ref_pic_lists, + current->num_ref_idx_active, + ¤t->sh_pred_weight_table)); + } } qp_bd_offset = 6 * sps->sps_bitdepth_minus8; if (!pps->pps_qp_delta_info_in_ph_flag)