From patchwork Tue Aug 8 10:58:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 43170 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2186756pzh; Tue, 8 Aug 2023 03:59:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErhS7FbDML9dIg/L/n4Q0EuEFwm86aPNdhTkqMpPVNEpalbpBOou0VjKSHkE+ua7csFz10 X-Received: by 2002:a17:907:2cd2:b0:991:b834:af83 with SMTP id hg18-20020a1709072cd200b00991b834af83mr9061305ejc.59.1691492370062; Tue, 08 Aug 2023 03:59:30 -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 ec2-20020a170906b6c200b00997e71d0377si7069689ejb.366.2023.08.08.03.59.29; Tue, 08 Aug 2023 03:59:30 -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=WntAbrm2; 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 D4E7568C51E; Tue, 8 Aug 2023 13:59:20 +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 3DCED68C778 for ; Tue, 8 Aug 2023 13:59:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RvuH8m65wF31/LEnmx7s4OrhCZjr765pBZID+LAuSBlG+X+MGdcpZZ1d5jc6mAUpiYXmebl0J7WXS59+RLbDE9zlfZIYUgUoAtoIpWf37cbQzrUbd07EirIrLDSV4RHcOL3429Oh9tS5UFvfnol/cdDdUUa5E6trXqlK4/WQ1IJEVMfY89yLi1CT1Xr5UWOY3HJnsNXv0oI3dAGf3fN8VI+4r3NVEyVtF6K4ZYKbRV/ZdoHCoe8Bw9BWhh6OBLo/yoMMBVeqFM+vTdfrXOou32WpiVBJZhEBWOpcL9Pxbg30BJtNkazw/0CWVDJxhqDZB/GCzgicnL2yRNQEqrRmXQ== 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=ngMSIYpwg7pBpLqfKK2ZsahaXAsUWCIFlJG54lRqJZ4=; b=Dw0+2Bkbgjdqc5G9rSp1dPnNmONHXB1jnzbyZ4RiF9VnFzExoBg98VOEppBn3kt6KpBJHWeS8tSvO1rzJN9iEAA0SK/ODaAdvlifOH/b+rt7wcsDHW34IHJwiiIw4cWpDGDkEEm5gDM/+XZS/XyFUWKTnO0PrYiMcV0EQn0wkx628j3kaO2jgrBstbBQg2vMPTF8sB64SQlS47v6x1X0Svu1ayQ+IGpaORp8cn/WO45rRwTplw2jYs+TeEe/M6Kkr/lEDNeTdxhKL53Bk9WnkUUZcc7AYTZfmXKS1/c5QxYbfSfr1ZS81fV1GBvnQw1/9W1zrSCG0j8R+pc0LL3uGw== 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=ngMSIYpwg7pBpLqfKK2ZsahaXAsUWCIFlJG54lRqJZ4=; b=WntAbrm2HOOyM8pgvtucmWQ7ZFouKJMtY5JmW+8dtbSKMiq6cSrHfPU/5Wys6yaDJB4USAYWTJr/FLC+Ht0cjCujkvRrttEM5hZGZ3/0BKFopgEMHSfLNB8uhRin/06E2rRWRSLy/k4Iiu+mvHVol8t2lIxe0gK3BMuyJQ0Bz0Hb3h7GkKbCcLh8OWTHYTg+78+N7E1elbuylGydAkoQFCXU+qwCJG1FnBTmbJf7P7gbygF3S10kkaX8o6juiYaVYUNv8vbaNgvb08pmoRVV9P1P0S0v95EN2qx5CQvThg3F/tRuRiEGpS65TTlisHZnc8RMJ7KRFQmowVFQzurWNA== 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:05 +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:05 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:58:58 +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: [7mGS0p2NNxB9GVux15bIibjTy7+mxzzd] 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-3-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: e1bfb793-280c-4ef8-8e5e-08db97fe7b6d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lIfu+aqmjcUkxwqO6w6KjqVDlw/cyqjzErRQ4gd59Pfq+59s5GFWeYXYv1tpZfPkw98lmPS1BqCxQB1XhrUoilFdBSWkyQK+B5/FZT12/OzmD9NVgimF/YyEPnVkgIJYDVz8xUDSyj2hw30ZL7HIL0Z+KOJgSIrBDvZqgfkhn4FXZdBcIOGM9TDTruAxJyj95R7Lbvsh7C2GjK3AvHxC974xZ7KCfw1Ip0TZUXPs0fvslQTLclyBJUZUyyjbJmX1ohhrfqIdyBIHrAjyihPsLKx+xHeNwZNTZKzIuRifKhCvM9z2sJ2E6UTEdt3CWWejYd7FIsKXJ8Zg8xxYyCJ4MzwsOypY6GVhG6k8p72WFtzoazSq+iGOMeiBcagb4yf3BBglajSGn+vIs1vNep2L1k2EyGWmAasJqLnUu+hAEvFdJUQSJcd34O4qHfV5d32LQAnhMn2in/iIheUEXxspCJI3T3xHI0P9uhlOP4NiaYV55Dy5mf3BXuD6lTDWbSmgefV3LoYek6f96kSlE6rB+br3c1cJ1027V5JR9mBm27SKqk7JSZW9PP9xeMIQ+qcmRUmlYK1zkTLYNDcsKtIic1XcF+6WJ1C9lfZ2y6JGzRTD+OvwzWPZ+QBYA+KEEsSN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C44LsgvDlcn+n3b9o3M2frrcxjcOnyavKfxftxX5JB805z7w0Zj04uKMUADRsplzKlfBe4YMqY4hqPSfxSncTKB74RSBCRX8kAv7aN+CIlqgu5TZfCN7Wg4GtkHc6MYOvf9rvtv/QCJJFIBF8PZkBg++Ot2Ylr/J28OILpfVyRIsb2ftm5Gou9gBtQnqrEbTWoB6++zqNqGnWRUsqx6sQIynjlwL7c1HRJFB8aBc2vyVFMcs32akD2S76KlxTMalpAcC6CuaozeZ5SJULMsGNSTe4WM7VUFNoaBZCKMvEWriafUzY4OHLWFSXTLlwy67OgeHwH4UnGLMcu7WP5UEMzEY/gZe5EIfgoN8hObZUHzn6Y1+k7tmPgaCC4ufxOU6C7bPh34YMsDp8FSw6n1SVOLgjnCzTSWuLOO6gfxwmCUTFAZq4471HOq44oWLhdJowh/47GaMM3GsYVhstMcc9wE6FCBZLeQVOE8LpQqfcxxLh1TSLMuIIOWKeBIsBlezNJb0E/v7QCFzzPLy3xvGs+IJOJNHTIqEZoU5eUq38+AjU4GFi7rawSD3xiY4U+w5dkvkQ1VV7NbxzF5/w2XLdTKPrCRN53w2Xe677ujokPt0UFIj086Cv097AbbknMi5567NRpJVwdyRm6yj89lsaTvk16xll0idnzuKdQqXeHk24et3E2SNZztnIHLM6NegWSRIOSwJFdEST1QNWLH1yJy55108YI4beo2aBTve+22NGQaXiB/W1JAuOa/9j8MsOEJxdzRfozXbft/QkWXAd4zLsv32FUiqyuukPyelK2Dh/rJwcWldXAwNd+gK1g1J5WgnKWFNAovN+oycnFLe05kmEvuGqAgD/VeOOvd7AZx0Tol1jsinqs6dCzhIbRTl3pSo1Y8CcIvxb5Lke5d6CZspqDVYDkiY5sawJ+Xbeom84RiKvBHOLNLn39QKq4TDautbT61vBFpWN5DIwcXceKvHMh46zxfSxv7c3YYHHi46RcVCT30BnrJV8VrTlatEcqvX20yYdLlIUYHB1lGtYfnUZOrg4pGpkSwV+FOFNW97eLxYgrB3OIBVbAyfZc01mt2Uih707E/8jbea5OE9yMqt1w5YeZe+TAcuXA7fF9jfxhjfpW/tPwGo5p2Fe4jASQlPeILcZxrmsbsXzCACg3WzPUWtuF3opC6Qd38oPuQz202CLyg4CqQM42g12ziqTib4YJ3Nb1otytR/Mbhyq+eKgpWj/EHL78FM+U4BkGbij4DVg3hqFLZ6xqw+vHUX X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1bfb793-280c-4ef8-8e5e-08db97fe7b6d 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:05.3969 (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 3/8] cbs_h266: fix inference for xh_deblocking_filter_disabled_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: B9FW3hNQrACj if !ph_deblocking_params_present_flag is true, ph_deblocking_filter_disabled_flag infered from pps if !sh_deblocking_params_present_flag is true, sh_deblocking_filter_disabled_flag infered from ph Failed clips: ENT444MAINTIER_C_Sony_3.bit ENT444HIGHTIER_D_Sony_3.bit --- libavcodec/cbs_h266_syntax_template.c | 76 ++++++++++----------------- 1 file changed, 28 insertions(+), 48 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 801feedb4a..7277154c40 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2938,20 +2938,14 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw, infer(ph_sao_chroma_enabled_flag, 0); } - if (pps->pps_dbf_info_in_ph_flag) { + if (pps->pps_dbf_info_in_ph_flag) flag(ph_deblocking_params_present_flag); - if (current->ph_deblocking_params_present_flag) { - if (!pps->pps_deblocking_filter_disabled_flag) { - flag(ph_deblocking_filter_disabled_flag); - } else { - if (pps->pps_deblocking_filter_disabled_flag && - current->ph_deblocking_params_present_flag) { - infer(ph_deblocking_filter_disabled_flag, 0); - } else { - infer(ph_deblocking_filter_disabled_flag, - pps->pps_deblocking_filter_disabled_flag); - } - } + else + infer(ph_deblocking_params_present_flag, 0); + + if (current->ph_deblocking_params_present_flag) { + if (!pps->pps_deblocking_filter_disabled_flag) { + flag(ph_deblocking_filter_disabled_flag); if (!current->ph_deblocking_filter_disabled_flag) { se(ph_luma_beta_offset_div2, -12, 12); se(ph_luma_tc_offset_div2, -12, 12); @@ -2970,25 +2964,19 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw, infer(ph_cr_tc_offset_div2, current->ph_luma_tc_offset_div2); } - } else { - infer(ph_luma_beta_offset_div2, pps->pps_luma_beta_offset_div2); - infer(ph_luma_tc_offset_div2, pps->pps_luma_tc_offset_div2); - if (pps->pps_chroma_tool_offsets_present_flag) { - infer(ph_cb_beta_offset_div2, pps->pps_cb_beta_offset_div2); - infer(ph_cb_tc_offset_div2, pps->pps_cb_tc_offset_div2); - infer(ph_cr_beta_offset_div2, pps->pps_cr_beta_offset_div2); - infer(ph_cr_tc_offset_div2, pps->pps_cr_tc_offset_div2); - } else { - infer(ph_cb_beta_offset_div2, - current->ph_luma_beta_offset_div2); - infer(ph_cb_tc_offset_div2, - current->ph_luma_tc_offset_div2); - infer(ph_cr_beta_offset_div2, - current->ph_luma_beta_offset_div2); - infer(ph_cr_tc_offset_div2, - current->ph_luma_tc_offset_div2); - } } + } else { + infer(ph_deblocking_filter_disabled_flag, 0); + } + } else { + infer(ph_deblocking_filter_disabled_flag, pps->pps_deblocking_filter_disabled_flag); + if (!current->ph_deblocking_filter_disabled_flag) { + infer(ph_luma_beta_offset_div2, pps->pps_luma_beta_offset_div2); + infer(ph_luma_tc_offset_div2, pps->pps_luma_tc_offset_div2); + infer(ph_cb_beta_offset_div2, pps->pps_cb_beta_offset_div2); + infer(ph_cb_tc_offset_div2, pps->pps_cb_tc_offset_div2); + infer(ph_cr_beta_offset_div2, pps->pps_cr_beta_offset_div2); + infer(ph_cr_tc_offset_div2, pps->pps_cr_tc_offset_div2); } } @@ -3321,9 +3309,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, if (!pps->pps_deblocking_filter_disabled_flag) flag(sh_deblocking_filter_disabled_flag); else - infer(sh_deblocking_filter_disabled_flag, - !(pps->pps_deblocking_filter_disabled_flag && - current->sh_deblocking_params_present_flag)); + infer(sh_deblocking_filter_disabled_flag, 0); if (!current->sh_deblocking_filter_disabled_flag) { se(sh_luma_beta_offset_div2, -12, 12); se(sh_luma_tc_offset_div2, -12, 12); @@ -3340,22 +3326,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, current->sh_luma_beta_offset_div2); infer(sh_cr_tc_offset_div2, current->sh_luma_tc_offset_div2); } - } else { + } + } else { + infer(sh_deblocking_filter_disabled_flag, ph->ph_deblocking_filter_disabled_flag); + if (!current->sh_deblocking_filter_disabled_flag) { infer(sh_luma_beta_offset_div2, ph->ph_luma_beta_offset_div2); infer(sh_luma_tc_offset_div2, ph->ph_luma_tc_offset_div2); - if (pps->pps_chroma_tool_offsets_present_flag) { - infer(sh_cb_beta_offset_div2, ph->ph_cb_beta_offset_div2); - infer(sh_cb_tc_offset_div2, ph->ph_cb_tc_offset_div2); - infer(sh_cr_beta_offset_div2, ph->ph_cr_beta_offset_div2); - infer(sh_cr_tc_offset_div2, ph->ph_cr_beta_offset_div2); - } else { - infer(sh_cb_beta_offset_div2, - current->sh_luma_beta_offset_div2); - infer(sh_cb_tc_offset_div2, current->sh_luma_tc_offset_div2); - infer(sh_cr_beta_offset_div2, - current->sh_luma_beta_offset_div2); - infer(sh_cr_tc_offset_div2, current->sh_luma_tc_offset_div2); - } + infer(sh_cb_beta_offset_div2, ph->ph_cb_beta_offset_div2); + infer(sh_cb_tc_offset_div2, ph->ph_cb_tc_offset_div2); + infer(sh_cr_beta_offset_div2, ph->ph_cr_beta_offset_div2); + infer(sh_cr_tc_offset_div2, ph->ph_cr_tc_offset_div2); } }