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)