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 0B8884B0B4 for ; Sun, 28 Jul 2024 03:19:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 026ED68D720; Sun, 28 Jul 2024 06:19:18 +0300 (EEST) Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2107.outbound.protection.outlook.com [40.92.53.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1069068D6B8 for ; Sun, 28 Jul 2024 06:19:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eIfpHqf099kvKAPhbNbZ77r/tGIV3Ldmt3/AbXX9GngRi1WLI8nxrREwUXqWqcFMbrahZISuNah20LHtthi456WwExQ55vAB3BpTWWKLvDcQKy7yTPX4nykaL8Boy3vvb4vDtJPzYEzLZcguTWjel+YU2DB3bCiYleFopE7rJv8Eb7uiFzc2fGUUGzOSkMarthXIYamY13atem7QND7EHM12PZkx3Y5qTU7ZdVwamtJtjqQYfNd0GdRe8p+Kn9F4+X7FHLiQJ7JOX/w1oOQvvxDAO511dZ6lrWh417P48N60e4twtlFSz5TRBPPa6MSzRhEDTBY6SiT498Rjk3KMhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Oyfo4Tqsvb6LJGU0PMRy3A++hecIEsbxUtmy2hNWLXM=; b=gVrhgEnKmsm/pusjqYckyPbMyydbR+Zjy8PueQLGwkMIytrtZ8vxhZ6b9sY9hZQMlTAf3m3rVwqENmCaPDJpAspsUMoJ8A4+tLDRMoB20oIqAjwWP+LGyBwwMZ6fj9P9XNt2eht7Q1M59jGhxfYqz2aqJHw3w3POGC1eOMV39k6XoVvtLoW0eg18Geecihsaqv/S7Gzs81vyGfJgH5l1ePODoQJ9Z/UwlyfsfpPbxTP6QCBEWPucuqS63BRSZ4Ak4MPT1Cd0yG3R2Vqox9Ua5y1DSylmuIR0HMiXUtzdak3tgzHFwVadXqQHFvxkw3jhR1gH+LDOEUNQiFPzVrQIsQ== 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=Oyfo4Tqsvb6LJGU0PMRy3A++hecIEsbxUtmy2hNWLXM=; b=Epva84WboJI+MTF9Fl2cSUAPRVOFvsMdwCT1vfgeDoeyDlesxfY5yPXREPVP8N4zNYhGwajboeS/KKk/BUA+y6ZkPfBGvXvvjMsFTgjlMVXEKWTMbc8Ejsl5BE4nxn/TXCyGsVGuplWE8t0QdTQqwRbClxcD4U8ZmPDr2Bg5XoyI1xlAp6ahjLTL/lX6MoHhryOCG98+Ouwx75+/D3YNzMEHgYIOhyU8AxOrM9eRqSb3bHnFAQzzjEMBJVm6bY96ivL1wNay2UQQ5JeTuyGcCVAxo/jVxTMJq2PGcw86Uae2I2SwUWboglUBK8z4o6OX8SiUZWZGGTSP5zPYBfk7YA== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by PUZPR06MB5747.apcprd06.prod.outlook.com (2603:1096:301:f4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.28; Sun, 28 Jul 2024 03:19:03 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%3]) with mapi id 15.20.7784.020; Sun, 28 Jul 2024 03:19:03 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 11:17:58 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240728031807.462810-1-nuomi2021@gmail.com> References: <20240728031807.462810-1-nuomi2021@gmail.com> X-TMN: [ZcgJRkWq3WWa+8Ji5d5BMaH9ID8DBui/] X-ClientProxiedBy: SI1PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:1f4::17) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240728031807.462810-2-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|PUZPR06MB5747:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b9a0acd-cc42-42bf-3c28-08dcaeb407db X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599006|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: WI8BOZvw28UF9XZBNOydMFdd+D1jk77C8guuaYb2JGkvkvSdK4/fbEnRtf0kxVqWCe6Wfn1DFEYyijL4IRiyg0nly3VvmaMLWlOHVYs/dtKNK0cDw0c3UqgMpojfK+azSjq83JcnxvumSVJQFDUaDJfn5DfNVtpwY0UCz0TGLykr5xAuWsvAZg5udWXkbV5zAWL4fW99vB2ZsN9Tj9RDApY3rWygkfsWGeQm1hbaOZSyhOmy7Lr5kMXdEJApVXMlZUre/hQFFJ7jyPj60vUzqGGpcCNi0Z1Te3g5QeaBTXOMcrRiqhXIhIA0X2RAbGrhtuPEJ4XYaqPRHoC3ATKcvXFxNKa62BvXgx6G4/iUIQ+TztSrP0zmZMRf/3xeImJgBkO5j676p4sOxvLwAahQa4m5gqxLB7N3nTzw4ASefa3XiCex7HXnarfoi6NvTTsjQ7dR3CioiNl0zrLFGDxaGzhSJZr2+IU/uMqUPm2H7ZdwQDf94/BDSJ4O3JmYp9sqWf94a/A9OJqpoa9na2c8ktURFdXyHPQpaCdt83IPGdWP7MXtYpXxmaLhsouGeFMrnxnvhgNYBqbYdEDvLcT1xD4K9551McJcFJNe9b+9Md8HzY5rvmcGoUHAmtSYVfIahcxukCAdp3GcmZ+15mAmI0c6Mg6Zt2iPdH1x9w0jDUxruOlw3bC2YUWody3XRE/7kTtr7Ai1vzmp04g+HDLpxA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FMErFxdiv7YNAh1MzZryQ0oDTkpHbjBaTVoef7182VD4n74QN559Kul1o58l?= =?us-ascii?Q?XU6r4U6q8aN7P3KpV6lhsuEidFLJ3b+QClB/RJuAQDL2drsxG8AEkOdfRVfL?= =?us-ascii?Q?MebZx4SOlmmI6LfRRs2N1x6vMuSUexd2Ovp+3pxpWD30CF1ibMSWgxrVwnpq?= =?us-ascii?Q?z6yi78T/bI6+jgKaZiJAb3M/eBZtD6BteF2G6s+9zn45+RNoYZbdoA2xth8z?= =?us-ascii?Q?huz8qNt9CisthrmbxEyopS/vsDxsjXIGVuIYd5GN11bonlrxtQm2B3pb3C10?= =?us-ascii?Q?nsHw+dimvWVqsUV6As9o26PfhS0Iuz78XZEZmzA/QHxkrZE2ubOVWE1azGmE?= =?us-ascii?Q?omtlQW0w48BGldzc2b0DaoNs5rL6A+fO5HcdxyI3gcd4vG730mCV+7Jz2GJs?= =?us-ascii?Q?1yBfbZQwhN1ttW/qPXlVGGWGwpS4GMdxBrSDtpvEorEaz9517G1dHtAQ10yc?= =?us-ascii?Q?KXVEGqFq13PnDmC08Js442iV+LWVYJQyzcsumuj1MkG1sEqNfFvJoxInTvQ6?= =?us-ascii?Q?jGfiU08RFHD+8OHdrIom6xLLnSA25+CNr9Y521fhh/c6fQFvgAVl2XmKUu3j?= =?us-ascii?Q?0GctdaWNnJn0IimgFj7uipvL1k20jcXKZb5zGZ5EE2Xh5Deo3uxCpt/yo74H?= =?us-ascii?Q?JU8cuDSbxbXrtHDuC74clDiKQuyrzsXxjCvFPfDZO/x+6eBBTxonbXWxwyiE?= =?us-ascii?Q?qCMfs/Vi0WgzqbYKoAXFS8EnsjKTaYlBXvuy/xZvIiIB8tzQeqxLLRnoRZPG?= =?us-ascii?Q?POOf1tPAYu1TY3NccTJJBhl6bqdQN96Zlbs0fdb7F428Ag8tFV30U07MXNFj?= =?us-ascii?Q?wlz7c1KPKNTwdPCS+oC9H5QAf8RCoaJvgVr1dHpJmJQkf/gyoryJAoCql8jj?= =?us-ascii?Q?T15fdVjOpxdakQmFRQyaBIfxmISpFsu3LGWiFA/ituCx68nNNldXYu0utS+v?= =?us-ascii?Q?ClGTqQ4gYvSXUJS2FEZZkJ9P5o7mmUQVkeI+7pWonlJQiIzYfW8CgSVnxu+H?= =?us-ascii?Q?iCe5BfRRh+Vs1DTAenuDDU3q/59mhOvMIP2r2UowY5g1+tpUds0/G7BWPCPI?= =?us-ascii?Q?wn7bNW2Bi2OCiQEMGAGJEjWtFFzW405NMiwDBbvBKW2uYAn/O9i+dQjPEZoK?= =?us-ascii?Q?OefElWMZX5e9K/Elq85tqO5CwOD3WmYrTpN5buiJaic/wC+gOfecVOS+pd61?= =?us-ascii?Q?lQTuAjFdkIhTheN0QUe2duLmh5E2D8ep90B7k6NOZqaQ27CXGCRRSswMjrsV?= =?us-ascii?Q?FgfSiVPgTyy/xADHfJRtGx6hJKBNl+enVhBPHAQJLw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b9a0acd-cc42-42bf-3c28-08dcaeb407db X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2024 03:19:03.0956 (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: PUZPR06MB5747 Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/vvcdec: refact, combine bs tab with tu tab 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/vvc/dec.c | 23 ++++------------------- libavcodec/vvc/dec.h | 2 -- libavcodec/vvc/filter.c | 4 ++-- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index d04f68e4cf..ee009d4181 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -178,24 +178,12 @@ static void min_tu_tl_init(TabList *l, VVCFrameContext *fc) TL_ADD(tu_coded_flag[i], pic_size_in_min_tu); TL_ADD(qp[i], pic_size_in_min_tu); } -} - -static void bs_tl_init(TabList *l, VVCFrameContext *fc) -{ - const VVCPPS *pps = fc->ps.pps; - const int bs_width = pps ? (pps->width >> 2) + 1 : 0; - const int bs_height = pps ? (pps->height >> 2) + 1 : 0; - const int bs_count = bs_width * bs_height; - const int changed = fc->tab.sz.bs_width != bs_width || - fc->tab.sz.bs_height != bs_height; - - tl_init(l, 1, changed); - for (int i = 0; i < 2; i++) { + for (int vertical = 0; vertical < 2; vertical++) { for (int j = 0; j < VVC_MAX_SAMPLE_ARRAYS; j++) - TL_ADD(bs[i][j], bs_count); - TL_ADD(max_len_p[i], bs_count); - TL_ADD(max_len_q[i], bs_count); + TL_ADD(bs[vertical][j], pic_size_in_min_tu); + TL_ADD(max_len_p[vertical], pic_size_in_min_tu); + TL_ADD(max_len_q[vertical], pic_size_in_min_tu); } } @@ -297,7 +285,6 @@ static int frame_context_for_each_tl(VVCFrameContext *fc, int (*unary_fn)(TabLis min_cb_tl_init, min_pu_tl_init, min_tu_tl_init, - bs_tl_init, pixel_buffer_nz_tl_init, msm_tl_init, ispmf_tl_init, @@ -376,8 +363,6 @@ static int pic_arrays_init(VVCContext *s, VVCFrameContext *fc) fc->tab.sz.ctu_height = pps->ctb_height; fc->tab.sz.chroma_format_idc = sps->r->sps_chroma_format_idc; fc->tab.sz.pixel_shift = sps->pixel_shift; - fc->tab.sz.bs_width = (fc->ps.pps->width >> 2) + 1; - fc->tab.sz.bs_height = (fc->ps.pps->height >> 2) + 1; return 0; } diff --git a/libavcodec/vvc/dec.h b/libavcodec/vvc/dec.h index a8492f1398..eb8d0bad6b 100644 --- a/libavcodec/vvc/dec.h +++ b/libavcodec/vvc/dec.h @@ -205,8 +205,6 @@ typedef struct VVCFrameContext { int height; int chroma_format_idc; int pixel_shift; - int bs_width; - int bs_height; int ibc_buffer_width; ///< IbcBufWidth } sz; } tab; diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 7ffcb29f47..c96e59df89 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -372,8 +372,8 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x0, int y0) } } -#define TAB_BS(t, x, y) (t)[((y) >> 2) * (fc->tab.sz.bs_width) + ((x) >> 2)] -#define TAB_MAX_LEN(t, x, y) (t)[((y) >> 2) * (fc->tab.sz.bs_width) + ((x) >> 2)] +#define TAB_BS(t, x, y) (t)[((y) >> MIN_TU_LOG2) * (fc->ps.pps->min_tu_width) + ((x) >> MIN_TU_LOG2)] +#define TAB_MAX_LEN(t, x, y) (t)[((y) >> MIN_TU_LOG2) * (fc->ps.pps->min_tu_width) + ((x) >> MIN_TU_LOG2)] //8 samples a time #define DEBLOCK_STEP 8 -- 2.34.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".