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 D886B4A3C2 for ; Wed, 27 Mar 2024 13:01:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA05168D679; Wed, 27 Mar 2024 15:01:34 +0200 (EET) Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2027.outbound.protection.outlook.com [40.92.53.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 565A668C7A1 for ; Wed, 27 Mar 2024 15:01:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VlV4zNVut7hCCYKoVFfXkvWAl//PjFTD/DpQ7f8RvzBQ3906xY1I/8Kf0F3FTL4ZB+qfsEcLMpzhprxww26Daw9QGVccAGovso4Geq0pr/WKuFJCcv2DhcdvSg9m3BUCVXUYu74RTEd3rXa+sazi18XJwDuuVQIeQHVqCOE3LBpnCxFA5NjQ4uOzl6MSDRBr8h9pjGou0fQE2lQ8smTliosWyH+UVM+/bObYTbVK1C9OzCIIAixLzvUt4jdQXJSu6LwqUhPjl0xjlmi19AHLCrZMemoUFfQtcBkv4tPGAYyuyl6UQJc+h2U3abgOjlSYwnyeraD4eOX5Uy0dwDGsoA== 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=T3K/5xgZdQOShRJ3hbot/KOLBKNOhiWBLrGl8fdQ8Xg=; b=Ze4EZ3/2nvkutTJHpDoZi4WvycaMDPJhvXt0HuC9EHXyTKJclh6BJWJpu8R90ELpuFgNprHANzx5Fcze3S99g+IVogQY6o9P7M0tjv3R7VgBV2crepluHYoBBP672kfF0dFwR7bg+eMnEuiEPHLTjNEV/6+lVPLz9cYpTblBVtPrhBP/kwsOwE0OqvFthypqIBUze254gdV9LwSwRWuKNGCRzuh4HZDL4drWVXYugokAHVNl4ZT2X0G1dwfKmkvQR4C1olDSMUVv5xI6juK/y2DkLipGIgWUPxXBKXkmULaAQc7XTHpCvmzjo/uMSd83WWYqR7u4igYkw5o+nFZMUA== 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=T3K/5xgZdQOShRJ3hbot/KOLBKNOhiWBLrGl8fdQ8Xg=; b=OveWN0c6/sqZW3PHL45qUfuC8VDeSRuyvsKqi+H1gTdBjg1Hz+E+v+LGt0oQyJdEo3UXCNgX2+mS0XVxet4JHYqH5+c/MPE/fkwpKP03J6q15EAVCvRCGzqLrr0tLDKTUaeopO5zvMrfsyWSaqKHjA6KIxX7wi8NauHyl7yOedPJq2rHfur4KO+Y2p7QnnmRz9dA+b1vE42mVjSumWnR9C8OMmVC8Gk/qtZANeVN3iT0aC9LI8bZBMIZFerJcBKG6XEK7RLuPkAPpJe51Hreo3sQgby0tpTqGQ27Of5lG98/fL1675s6EvbsxQYJwJ68qn2xkYhGN6gzwieSub7ROg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by JH0PR06MB7107.apcprd06.prod.outlook.com (2603:1096:990:9b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.33; Wed, 27 Mar 2024 13:01:20 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::d001:da90:518b:ec1c]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::d001:da90:518b:ec1c%3]) with mapi id 15.20.7409.031; Wed, 27 Mar 2024 13:01:20 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2024 21:00:58 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240327130112.6111-1-nuomi2021@gmail.com> References: <20240327130112.6111-1-nuomi2021@gmail.com> X-TMN: [wNZDIq/IIlp5uNkC1BbQa62SS2epQw5w] X-ClientProxiedBy: SG2PR01CA0117.apcprd01.prod.exchangelabs.com (2603:1096:4:40::21) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240327130112.6111-3-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|JH0PR06MB7107:EE_ X-MS-Office365-Filtering-Correlation-Id: cf172744-50ed-432e-30ce-08dc4e5dff3d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cVQXhtF+6ijtef3BFr0j5C5DyPz5ImSvPH3fuiBc06RY6VONYhm6e6kDqdbJTT/yanjcnp9dreMivw0IYRJTzZx2fbGcg9DKJ29egjiLHq7MGFSz6cfn5VBtEzTwFmmUNGGar/4LMLBl2VILkP/7C/jTO55QhisMocGD/EfAgkgmUNXLJ0y8dFWqaCc1f5+/4pucUuBQ1Fopj90mKPi6N0B5H/tuzAetL6XaKWe55IxwPn3xB0gCG6OD+yy7SCgYb6lZL1BXqAbN6QHoLtHIActPXv9YQ2aogpS9EDyk1/A/js1OMoqJQ2+ekF/xhYKwYow2tLyii3RBI/ArRNidOlQAazJ/bBIVlNxWU/eO1ixpO+rwQZJwCFsKwoa14vhjzpV0iGnnBLGHhPcRRE5cHftf2jqowqce/Xg6eYgL/BhWI6E0O4njnF4lPAf3Oz6QeWnvY540RN8YOk+Wuqok5P+ZUhI8YfAvg20GvkvuyrpmFSaJTfmbhhqLleNEpWwFBabRnNBIU0vv8tP9tGq+wor9bARoGsd0xI+TGAan/pXzmmCXOTTLKZJTlJze/jAWJHTZNaTDQV0wQQn/T/WiG/+jiye1XMDqUjPJNMTsVJV1HGXI8AjUdHGzBDYDuq+0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JRv7So4SUJvHmUqPDunvOTN1K51V5aPOHm8BvmIRLeARtS4W7Clcx3ScUei2?= =?us-ascii?Q?WJucFtXdsb2Nl4XO8/XDAqw82rTrp0KkpUWiNkTv0AO0IX6LVMkm9X8GJQa7?= =?us-ascii?Q?X4ZdEqG3ZPyb9Bis9QL5Xu0ZoQNKfTVjeiWK2VdZejNp34lwqdO7qiHOfKAY?= =?us-ascii?Q?gYacSsy8yXJdWlaWx3q+0JH/GS6LD2mwWvahI/+nsHq4WhxatI5Wz/1EWQs/?= =?us-ascii?Q?5AVIFo+esq4QxI2ykQ+68cmp8JD5TPaIAmBmB5K1ag/VCGcdQEaeAcQuUB1A?= =?us-ascii?Q?qvWjPzC8TpbO8t4O9IX8EJ1oAXqOOgMT7xLH38N60fzfjjcxB7JlqNvOPqQB?= =?us-ascii?Q?vPNDFieEgW+ycjVhfIGkL7UBZiTLC+AVQVs/HC4wVHIUyBZ2PNdFGhP7sZIy?= =?us-ascii?Q?UUrOnbzUl5AI8YwHvfDzXIBShMeadkAmF6xlL3I/tG34jjwQ+R6oha3vSxF0?= =?us-ascii?Q?vmBYcMnGM+qbZO+l2KgGfqbDlbToyYMSggTFdiOFfIrMae4OkzRbLs66W16P?= =?us-ascii?Q?L3VBgS8he/S+X+3rwvqySDBP6Pc6YH/tXrmQ6Bas969iJsMYcMWGBRE+ujU9?= =?us-ascii?Q?/GtYmolaGPiLjVCAB2/JlLIasBSX2HCBJ5ttmQELf0gNs5i7bFhGlZ3k0Wnd?= =?us-ascii?Q?rOcb8fDhyTfQn4DbamZNTUSuoKEW/HBHuEAFgJzz1q/R1qs0HAlGfohp75Xf?= =?us-ascii?Q?Lm+gykeX4KseOIf0rMq024VhHf67nHs679DMVudBysGhCpB0LP3pr1QhmsvN?= =?us-ascii?Q?CiOqgA9zRbVjPAxDObbdm/xt2O4+2HwHh0E8B2/D0eP10dc54r8mSNQkSdno?= =?us-ascii?Q?K1bcSi+m4H4POSNiPbJzT996B9gY2gZsDJy9aUwL/5UULwzHBuhMXlXrwRoR?= =?us-ascii?Q?NTCqGaxC2k/Bj8xEztLdgasXvYF8uvVO64ueO3L/AN76Z3ESQI7dtAZLZ8nf?= =?us-ascii?Q?0TKGMD0BPXR24c4qrUXR88ash+s0DhAd6BbgxYqTrN5TxzSuJpxb+fh3A40o?= =?us-ascii?Q?HB/wzFWHbZ6rlVX9fbf9C3NQsHwyTs4WIO5WvDgWQm1tFPJvK8Zp7MrGhwos?= =?us-ascii?Q?ICLAOyXLDZU09Rhdv2U23Ov2MxncLvoMA5ZU0SKoggT0ctuHa4iYjzQxQgrH?= =?us-ascii?Q?nfjc/+2HiyhzkFFZQh/GXclPe3SK8cyoqIXtvldbPjO4H2qZx52oxOys0G7x?= =?us-ascii?Q?Cn2kdYoBr1pNLC3QNCJryUYApUn8+M/BwDMPa4dIQyH3GFGhARp8fKlX/0OB?= =?us-ascii?Q?R+0fyG55vyeX7W9mnfCSb8CZf6BfMmGoU+usofD5uA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf172744-50ed-432e-30ce-08dc4e5dff3d X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:01:20.2737 (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: JH0PR06MB7107 Subject: [FFmpeg-devel] [PATCH v2 02/16] avcodec/cbs_h266: fix sh_collocated_from_l0_flag and sh_collocated_ref_idx infer 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: we have to infer sh_collocated_from_l0_flag and sh_collocated_ref_idx from picture head if pps_rpl_info_in_ph_flag is true --- libavcodec/cbs_h266_syntax_template.c | 32 +++++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 0aae9fdfd5..f56066d470 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3221,19 +3221,27 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, 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) { - 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 && - current->num_ref_idx_active[0] > 1) || - (!current->sh_collocated_from_l0_flag && - current->num_ref_idx_active[1] > 1)) { - unsigned int idx = current->sh_collocated_from_l0_flag ? 0 : 1; - ue(sh_collocated_ref_idx, 0, current->num_ref_idx_active[idx] - 1); + if (ph->ph_temporal_mvp_enabled_flag) { + if (!pps->pps_rpl_info_in_ph_flag) { + 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 && + current->num_ref_idx_active[0] > 1) || + (!current->sh_collocated_from_l0_flag && + current->num_ref_idx_active[1] > 1)) { + unsigned int idx = current->sh_collocated_from_l0_flag ? 0 : 1; + ue(sh_collocated_ref_idx, 0, current->num_ref_idx_active[idx] - 1); + } else { + infer(sh_collocated_ref_idx, 0); + } } else { - infer(sh_collocated_ref_idx, 0); + if (current->sh_slice_type == VVC_SLICE_TYPE_B) + infer(sh_collocated_from_l0_flag, ph->ph_collocated_from_l0_flag); + else + infer(sh_collocated_from_l0_flag, 1); + infer(sh_collocated_ref_idx, ph->ph_collocated_ref_idx); } } if (!pps->pps_wp_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".