From patchwork Tue Aug 8 10:58:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 43169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2186696pzh; Tue, 8 Aug 2023 03:59:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfoNaJptH8mPJ8endYNnq2bekVrDWeNuXmH4ysuxSYmggtRCeS1qHgoodOZE/JyTpMcYhM X-Received: by 2002:a17:906:209c:b0:99b:ca24:ce42 with SMTP id 28-20020a170906209c00b0099bca24ce42mr9959177ejq.44.1691492359537; Tue, 08 Aug 2023 03:59:19 -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 q3-20020a170906770300b009939d1b60bdsi6752089ejm.67.2023.08.08.03.59.18; Tue, 08 Aug 2023 03:59:19 -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=YfacCnAP; 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 A86E268C79C; Tue, 8 Aug 2023 13:59:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 A84BF68C63A for ; Tue, 8 Aug 2023 13:59:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J/jEJ2e9HsoKn4ZDer+3ORfbauAY1ENoYB18Hdc7Y2nivnF/qFL+3YyW3gruqCQvv2W7KOWlNHDBJjFyn3jDHEIoO8O2Nz3xasomPwWY6vddT0lG28y3qDLAG8Gt342s7fqDqdqRqUYdjHgcmuZHK0ZD8GPAXHDk47vQLUvzd07C1E+cOly+BaVODX6/YgsD5vnSdmVuqZc+toYrJFQeWVM5oZiT0lX49xtaqIhPvtn3emjP1m0ORaeTV0W2+Dr5ryvM8+2wv7HBaSX3CELmgDtRYU+Gy0Sk5B1NqYVxTsDCj5EtGe4JNLXLRcoTxJV3vpN7V/5PTwW4lbKthJyZjw== 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=2EQb4F0eeTPYaFJjezdxWPxJJPxaONS96ycJTteLDE0=; b=CrwhbsOIuF0T+c0WvhtnE7BvzXkvaq+zwjaIAnTUJq6HSA8TLQivD3kbevX6ySfNHJsFi/pKC28yn3guSmmi+HV3ZARvEdQ5P7DWCx0AUDG0zjVJldO7Q7Ub72Z+x1l9OucPp6MVO13HIWCUR6zvxvvrZHSeX7ubEpoJQDu0x3POrOXC3PRsEJVMAoyKYD0fxkoF/lp5jS9cf7GBtZwUVnJuLh1EhWce19ejLdx41Qww6ZWfbc5MOUJ3WMDPbFjzbr/C7s+8ltu9itvDgovJKmvU1eQPugjuqfoGEC35OLKYLC5hrgEOu7WZvrLu6yB3RuBGqORj5f0l6io9NXYIwQ== 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=2EQb4F0eeTPYaFJjezdxWPxJJPxaONS96ycJTteLDE0=; b=YfacCnAP9luNvkSKc5fTN6dkXHNIGnvN9nwb5w5WO9xL4QTeTFACTx2OZAfz23gewg5f5Xjz+CgedOfYhY42sXtD93u43S4Ke6cGkAx0mJOZoeAY9sJTzk4xLum9NSEl8AlVXHydlvF0nX7ayR+aEJn/NmnNZnoZRBrI9n15LESoOvqOS7PiNNuPDfHLVKwTTse20eaRvsjvycbGB7t19cycT6iSn4ol1v9igOlxSAmaV1b9xV5qJoN2szOyTtCJRC2IDo1MwnbekboZczHM0ngnevkesf4LI7VXaqP5YJ/QOzzj4VIcLbmBifP+46GIjM6ouYRSQ0qOZ86J/FHTnQ== 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:04 +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:03 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:58:56 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: X-TMN: [CHs7vceKgCvPBzrNjPN4gpG1FP3V8DiB] 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-1-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: ee057106-a2a9-47eb-57b5-08db97fe7a5b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tliHEQ0fXXb3x5OxT0K6/I/Lzvc0GM5KDmCho1LcumPwA4JXQaJ4PR7jIIT/I956Bcuw7oo5MWaDtN7L3NrBrd7zu0VU7S2RFw8DJbScxs37fLwt2RdIpYmftUsW95WAn4T4XMpqL5syWlcJ4jTwQOQOU9Si2jEgfwi0LlkimU9FAKMza2KCHNFernablVWzzPj1bTPsiaPtt8t9VnsNV++EQrYZXhqc5stMUscy2ij7riRUv89thnmWic47FMuDP25Udbb/rNrjxNnHD/CfbGYzn6Stn/kqR8OzQ5Qrb7a/hrgrCGQQ+l6K5xwsU7VHFEywYhWeHHbz29KmLOcc5A5MompBuLhs/aHV4hurYSNyWMpa0kMCzEbt53AyqTP6JmfzSBdbcKtFUPHzyu8Vn6BElvB4/wwQvhbuW1c7fYd1dpJOxCOPCtBPjxye/QynsEfFTKYtLRJW5Jcoj2sqtNyqEzm7EfXhdGmtmjwbi3wrjlxLRxnmG9tAoc/kMk8je2x+kHiqkjC0gE0NeUDuVInijXavgvVcS7oPRfjxSDYT8C1Zao2y8sHAafTmLDRBPSrqPFMOa87GFirEpVBh1xF0Er0XMM6lekUcnwLFY6nzBFalL9AcrVVcdjeHR7+y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nqKTh6Mz8ogIe9mm78VKr3a0dE0dOZwTgWeyTnH5n8ymREt727omPJr3X6tOj43mKTWLxwA5LDLS15EX/fInZ9T7s+BK2rtIyLgvwRXEHImDaebN3h1KnTrOFzFO0VlGUbXP9EhXH7+9t2WjbzTHzusoYSlMIM6rsMvND99T3yFqO5xWacrcDzA6Zh2SXAd4DVebIhfl61eZD5oIlsp3Dcgehi/ThadfFOwZOBaSp5IS+0T3mB9SowG4AGqJglx2y9cZFd2Bq718gdXsxPZc4oFTz2E3aQebC7E2baR+k5vWxMHwH4JIvXO0HESDdlAZAGY2Cj6Fev14WRdKlilxLagGwnrvZsjJyHd9kjooqC6zJiLsOJLN+woNPK60ZTjjYcssXaDM09x7Wu7Ci0LuDCrayLQKQHRFL/wn1/CgucyywpSv7HVKnY/8ljahcvRK7jLX8mtXPXJll3jweexJwwgPMA/DikhDK7CG6h+qJ8sGrw3B+D1A7YNg/kstbsbfZQMD1/OE2tH5C5yZJAmp0aB2f/vgX8bLLnMdy0sLgkhmB84rvxVZk5XVlqH8qhRRRZBR3hpwe8nda1weES3zeKzwJ9r7e2oEfkLBilwHp1oYJ6ynb+698W1TylT3TC4JlVDomLPMVIWPbds0N+PtF7PtLIKa5TYzmA7aZH9QmphmvO0VAMSWtP9Ddm6ImZJxOjZBDhI/bmaonEXr+OH3aFWpZKuzrOIGN96Zv3m5sp6bJipZph75e0M3Nm15vTxTpI6OphS1RtlipIV0LkaW7Wx5mew04qxJQY4A4vRrEO5ycn0z/JEM6Z3+dYKfErAPQOv47HtQayAlxTvpxo48VYf/r6CR/iNij8M7Fm/x5pkKSsoTcTMUGtcX2mE15wTfOE/aIPJGDqQidIjpQ8bC6eDPhRGvPwv4V74DY+7jWWKemBoU8FMOBndxXeja/pPv1QHG7gxkff8rG0Nw+9pcR0NqsvMQ99HXmXacXT1XbkWtnio7Ks6L90DogAm4kcG7j0jGVOwwH1uLSwqS9LC1P/9KE3l8qKwFNu71KiAOVnB2SaNRdQW6RL9wfPYYje+RdlCo+MhbZnpf3TbtU4bbyU4ZNc2kzlZ8aXtYLN6EDTH4F+V6Nmh+8kNAhNmJfbk49Yx0qC0eqR+gTswBdt5mKcVfuJM9j8DNbBrdnEjtrb5nbOWfNeD45BpCnf5H5NrynOfW8bZkjzIswWQ3HaVbNahw6myZlbeQ9Z7K0s3ugy1zIAjN2Ord0ubXdtKS73D2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee057106-a2a9-47eb-57b5-08db97fe7a5b 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:03.5867 (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 1/8] cbs_h266: fix inference for sh_lmcs_used_flag and sh_explicit_scaling_list_used_flag 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: 2BvOmJl9yfXi if sh_picture_header_in_slice_header_flag is true sh_lmcs_used_flag and sh_explicit_scaling_list_used_flag are infered from ph Failed clips: LMCS: CLM_A_KDDI_2.bit STILL444_A_KDDI_1.bit Scaling: SCALING_B_InterDigital_1.bit SCALING_A_InterDigital_1.bit --- libavcodec/cbs_h266_syntax_template.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 98a8e033bf..857882655b 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3151,17 +3151,21 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, infer(sh_alf_enabled_flag, 0); } - if (ph->ph_lmcs_enabled_flag && - !current->sh_picture_header_in_slice_header_flag) - flag(sh_lmcs_used_flag); - else - infer(sh_lmcs_used_flag, 0); + if (current->sh_picture_header_in_slice_header_flag) { + infer(sh_lmcs_used_flag, ph->ph_lmcs_enabled_flag); + infer(sh_explicit_scaling_list_used_flag, + ph->ph_explicit_scaling_list_enabled_flag); + } else { + if (ph->ph_lmcs_enabled_flag) + flag(sh_lmcs_used_flag); + else + infer(sh_lmcs_used_flag, 0); - if (ph->ph_explicit_scaling_list_enabled_flag && - !current->sh_picture_header_in_slice_header_flag) - flag(sh_explicit_scaling_list_used_flag); - else - infer(sh_explicit_scaling_list_used_flag, 0); + if (ph->ph_explicit_scaling_list_enabled_flag) + flag(sh_explicit_scaling_list_used_flag); + else + infer(sh_explicit_scaling_list_used_flag, 0); + } if (!pps->pps_rpl_info_in_ph_flag && ((nal_unit_type != VVC_IDR_W_RADL &&