From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DDEC042337 for ; Tue, 8 Aug 2023 11:00:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9968668C7CE; Tue, 8 Aug 2023 13:59:33 +0300 (EEST) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2062.outbound.protection.outlook.com [40.92.107.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3F3668C7B1 for ; Tue, 8 Aug 2023 13:59:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y82/DXhYDm6LNhw0fBSLByMGv1kE/PtaGvr5nm8iA+pIUD/oOYDI25A2/IfFOG4/S3iXaeMYXZZPubUAtlGr6gyEuGrEP9cyx4ujLKrMFacjdb3QVUX6/bMtXdbyheA5/0kZCiAVRYik0V0DZtgTFZXWX+EMGexWzzFDHRfDilO23Z6HzNrLtXqag7GIEBfsSGyLIqWh6VSOVPOP7LwyuuGNHuGREtQLFix6j5GF2ojjf/ZuYGq+/b67ZMd3+p3/q9pHiQLLKFxmpvNCdWHqtkgV2nvK445Gv0H8zjJmqfOfikpqwOhKxVNx38i97snCb8TCkp2mrqG7FYQSGJSC8g== 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=Frm/QovA/+rAIwS6Oo6Yh3I/B+uazyT227D9xbKg09WLXVyr5UNVuPo2kXG5bi5X54dGH9yLw6Z9dc4t1Ar47XsSZBZLvF6lEL3u+EIlxYG76Y88EJ4rQWiP4NScYeRPn2cZcCwTlMpTEGXDIaOBY0uSsvT566dZENTR/WSo8XoR0+Y1X8V6cyxfJ1REZHi+OOj7gYilCJJt1SIme10sJzq/c5g9YiTCJoME43YWGVBDpyEn8HVv2SuDDaQ9NZ1CnnxUimBvjEj5hzET8B0Ain12WrQvV6K7JPStULIxskMLuc2Zh8PJ38vuidvgC53kP5ma7CM4WtZN/S7wwCuiBQ== 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=Bpe93LrB/30cvxPnIQjYtdzN3DaByoKdANTJJ60iL5RJ5+2nmbxmhTnmL2CQIC9pexvNeDDe0O90xayEexD5y8wDMh4f5wW90ZNlw31A9PDsHT7tMuhLK5njc98QWvh1un08/YZlE/xbDiwWpe3ymDIID0OMBBKOiSEdoSZkRmKe6N8cLs9eFx1QfjA3IrU03RhKKlrKP1i0DcbqHhTEzAfu2oXMFltMujQkOCKd+OJrrNkQf6J98iStkHhNtm4xCTw6TRFj3ovE8qcZ3yvDkMJdC30J8Xaa0CzwDc2x7EYXID8Yw1SndME1z7LBHzJU2XnbiVoI5m1PeDvSSOBPxg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by SEZPR06MB5692.apcprd06.prod.outlook.com (2603:1096:101:ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 10:59:10 +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.026; Tue, 8 Aug 2023 10:59:10 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:59:03 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808105903.6667-1-nuomi2021@gmail.com> References: <20230808105903.6667-1-nuomi2021@gmail.com> X-TMN: [5MFUunxcy+Ywi35p/WTYeNBVrQ5mHe5+] X-ClientProxiedBy: TYCPR01CA0046.jpnprd01.prod.outlook.com (2603:1096:405:1::34) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20230808105903.6667-8-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|SEZPR06MB5692:EE_ X-MS-Office365-Filtering-Correlation-Id: 16cb8e9c-5e42-4b2d-343c-08db97fe7e28 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lLit3EgHPrNq+HBPnfs9E896BQwAsUN9hBxA5VFIMNZeykcG6kSX3GkhCXkuCTYRKv89AWKmwJNn6AtPKl5RIBYj5ehT11T4QVPCuuUVnhxqXMwMWGK5V0hMTBjXe981DsNsbOOn8SAy52gyekGpGKb3iChXRefhgThienB2AuKctiOX7nCcinLSOKM5ppTbKH0TMMCT3QuT8VFbnq/ZnKmT2SVRkRrDxu0c7NBkZyVzj5IZsfqDQffu7GkHbZKHKME0f1zieieH8uwiLnGvpdOnJDwgg2RvUMBnqsmYt++oQxQUtUo5LdUeqSVx6O43L7ADhELZTHXvu8MJ9cC8cescZVrQAyS53oisT+Qef4y9+l55PFYm1+ZYJWwVFwZpGs/jRnYvrTqaHdLeva012+LeanU74OqEDrCXvlr3GoJENylm710+iDJt4nq8J5smUFVo2kHLjfmm0sJQZuCsiz8WN2CBhUedyQj+wfMnOkFI8Fc1oRtB1dJ8mj/RN4MDNd125P6mIrQxw9Oxu8AOyHPwHXn9I5I0XWKipOGTpuJGuIcX6K/D8CpJtcgBArGMsxYsuMe/Tit7VRaEfJPDsGsKCYyZSEEhql3tiqG4NwAUrD/SsDBTNw9nRgTej5AS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h/hpDDyOedKk1PFwhi0IG+hhMlncPOvE7Ha1/72Gy5scaDuz+/OCzSjIf1N6?= =?us-ascii?Q?pb+VxOl6xWWbbXI10FlRw1Cv0pjRoHlGVUlqyzcVPU7oAti+8bHfT8bgnacX?= =?us-ascii?Q?lnDo3FqwVPIf6pfvuRjUSxW/VZhTeKWnbzVsKNMZwO0alrTbjt4G0luTFZus?= =?us-ascii?Q?sBARYDXz2cIDYE/XLWWT5/Lh/M92k+YSoeGWUiNQQhbXkGDZ3/xEyrKyu77m?= =?us-ascii?Q?vV2zIXEbzRRruH5rgPKAG5G/zFon+61LV896KtPPe/TA3rp7eIqZKGGlJv30?= =?us-ascii?Q?izUTeO8/d2vMHB1Mf503YmtgBHch626WLNkU6fCE18LkFj+0gQxLokD5Tp+T?= =?us-ascii?Q?a9q9LijKp+jFYlvZ1w4GezyIJynU7mYVsriUZOE/27HoXeAuw8gZogLOmgIW?= =?us-ascii?Q?0MPjjXaknFHMxAq7RHwkC+Q1N2GZVCLRyQAJiWs2aG8i4TzS58iK5TkD/3HU?= =?us-ascii?Q?3HdMpbgnBbYsejyIQVl1AFLnC7lxvQgBkps1Ep1W3OMN5qTpxJ2UcJjrS2sV?= =?us-ascii?Q?JBG1inypGIAbVyXz10tAZEnJakOvBKw2ewj3nm9bGJXERoG8l6vRC71/pEWv?= =?us-ascii?Q?UfXF7GwCNTBN9qitlavsMznVFIr1wMDrHGa9GjX8GyWLpCx9ONVIZAhDfIFX?= =?us-ascii?Q?Fyfaz2D9S1FfkALcG/cu4Q1U0ElHn2agkuZLVHPoZHrddf8JkWKlMJ9vkC4O?= =?us-ascii?Q?zkR/IkC4lETtoZdAA9jswDTNCOJHI2ZvIx92vrlUtOWR+3E7SD/5LACrCjfG?= =?us-ascii?Q?BJU8TzO7CNCwtndbIK7bMKQ52Nd293NDwrgKOzxeXv0pByvRSgATEwU/DB84?= =?us-ascii?Q?sdKXfbMX+Dk4UF5g1ins4kMdh3kKGpuZI/gOonTjV3BqNHoXR/YcaZTEyjtK?= =?us-ascii?Q?Bng9IcGnkq9b4HS/bMjtj4xelX1DqxXRqIBlM6FnSegeyzG1O46gVf47wg8k?= =?us-ascii?Q?eMriazqkExvLhNTUSG31EE83WdxHtHqA8gg6yuq5ZupWFFpHtylyy4g8yHSF?= =?us-ascii?Q?s/I8yn9MqDso0CrdsoB3s/SSCMZs4oFAoDEFxiLghwhSmPwR+lECNVmObqbZ?= =?us-ascii?Q?MZfySH/r1enWakMMygiDRDbm2bjbRk42rhbi7eXW6+WzhmHb8Zs8JKp4xQ6q?= =?us-ascii?Q?pKm+z70D1lo5Ek6lPN/mc3kgO8Q0YJXn3oakB0LamdAnUeDazPeRFFnqewH1?= =?us-ascii?Q?0mY2s2kLkbKtYLTgt0zUNDd/3LQ73EhgIJLGl32IyDqCXRS/o+NSE/HSC34y?= =?us-ascii?Q?nVj37D3134i1U02UE+4M?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16cb8e9c-5e42-4b2d-343c-08db97fe7e28 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 10:59:10.0332 (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: SEZPR06MB5692 Subject: [FFmpeg-devel] [PATCH v2 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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) -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".