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 09CF44B0B4 for ; Sun, 28 Jul 2024 03:19:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1960968D784; Sun, 28 Jul 2024 06:19:19 +0300 (EEST) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2077.outbound.protection.outlook.com [40.92.107.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89E7F68D720 for ; Sun, 28 Jul 2024 06:19:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ffu7cT2LZyj9Wvdz0HPvrBuRU5DHEiFGR8iMAYEr81yGS7SXdojgm0TYGxvwFNAOohGOOXQ6IT7TibTaBzvzr4oezcmfEJ6hdNWfs/VMpU23sb3uY1eNKhlOYtkmHAZM++wmPxT7w1BdcZMUhY0fIiyRPMwmH4vSEAtXebUeaSJ3IJWH4UoG0DK8PcEyVDs5oYmsOTBdkyaQEzgGkdo6QNmIxbpDoM9K2c4R2V66KRoReP3toyeQsB6HZ+whVGD9V5XKfAfNhqhU2aFpbe7BeLdKed2s8oHHJ9BxQIvDvAZXx70xmRZQ2CdKr6YuFRe1ohRVlR9Tkz7+7b4AgopMuw== 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=T++tQBbvKYg5lPu0IFy7X3D9+wHx31Kg9syCC7Tnza0=; b=sqnrn9EmJKs6H4T4kj/W6YTMF1rky2KiTfEH23O429fDTwzUDxAQW3qAQPerJ2ALiWDuVaQf8un9XclBu2NtW8P7V5Z6M1JwuaqCtvXV/9TfgkwykMQTetYbce3RyIll1fLueqjqlpKvDw6Zy8jGVKO/noQeROS3Gj4e3nLfIJD+JdmqnPMmam3RTMbsExZnwauBRayntIGKdWAB2g7hkx0AlEshjofVPB1tdMR6qe10okHR6rWeJgj8Q4tFX7Vy8TjSKglxVLA3UPwR5b27ndqKHMXQ0SUiPcI0Ku6LoevlPRtfWkWyXaoB8B/xHbopWT+ZkTU1hRlrg+cgko+fdg== 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=T++tQBbvKYg5lPu0IFy7X3D9+wHx31Kg9syCC7Tnza0=; b=A1cE3RS9xOqARKWXz83uvgZOTdFgM7LbT9gtZsCHx1UOWVDfXyhKrr/TU8/QINbm0o1L2DQrfjdq53UJoQI/gzJwemeayygwOm6gbQjKzlfEKGEnT0akAdZQxDryWe6sZ15nj2W97pNDYqItyhS9nfbuVAQthyEBFrA4wnzwrG8jsSYWQp5Cubp1OGpDy4iTI9eiSWzve3/WxhzcIvU6TFjtFm6XPQ68Of0Jx3z/R1b+ldZa0HQ8PaEv0pzlfrrQvgalJBAw0zd4iCFxF0Mks8uqh1qKMndnwPMZQFIbfV3LzHrLi+ZXgKg+LPKKfZsc9NHyRhItuoSz1bOvTOqArg== 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:04 +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:04 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 11:17:59 +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: [QgpDqTf6N/S29WUZGO/QKEJwN30EYEMN] 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-3-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: 5f4db9f2-7ceb-4ebb-b078-08dcaeb40867 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599006|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: eNe1jSFntQ0RF34rOat3NgJfWid81QtaPcLYr4SgYcieSuQ8XipMp/UCl6xDPtPPhdfYcfzVm+pysD++3ZL4Xro2Hb+Ig8Oh6j07nVs1DfxLk9ZIfB61kVv4fYoTEQB/FTfvrXvEIZcidyOV1Ho374LjFrA5dZt75GhwNJl0ROfkDzhcWedtL/bXCjoYcCTfqZsNKkuPcKnFZDj1hLCaJM2dlUd2sOQ5bGiU3As1K71cJn8RXHG1GNzxNgFcfjDGTTXBqw1U8Wfr1FAKF6o9+BjZBzTgnZLsRCEj5wrJKxGc69CxMSWGiztbWDuEwpeseYLhtdhY83v3LNuRFl0a0DW9rm5KxQYI3nFzadQIgtJRjvnxwMTGOJMUjQRPx969/Yzahe9Vg8d8mWRKampKenAtSxPFXL8ZYy2/vQ+0rTol+x8nRfI2YcsdJu4LrNLQbryYKAkiDoDIqyGCLuPMRfyFD/MjZ4nWp1JtrnCCwq+TjCVSejkdmJGmlQvHtPBsuVCl3aqP0Eul04PZ6Zyw3NfrCDHGIvdPe+3Stln11v63TQ0B1GKkuvtQ4192F2ot2AbzHltTdF42UZ2AudH7pqhCnochPLnFbcelKmIDzsd0N1l85VfWywagVWPpWjQY+Xtb9vWWDKP0sk/dG4pad/uFSFtRIVYS4n8Hvj+F0uf+5YNtSwZcbmWzq6v1Z7w4MNAVrA/ait5Vi4+nxMub/w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AzlJEJa767wWucnyWlpVIRlLWz5kf4alOpMtkDPH/9fja7kPZ72dUvnkIIYo?= =?us-ascii?Q?sEKUbULpNrr0o+Ey3iTdxJmS2LK16tqTuUjWeP4sAw2NXn0/4VXaKixv5eHy?= =?us-ascii?Q?wglbv4+LIL4sqn1tMNjJqRqE5tOKOqYroOHdWFfsn6dqezeBZUu66LPiik0K?= =?us-ascii?Q?SEKEl02q6QW/bWV99AzXbOs/8jz3fH+s5i3aQ1nxICQO6RO9IZaON2c9IUgy?= =?us-ascii?Q?v07oJ2Q3VXakPfgZXhJkjg7vXUuUt7oitSUO1//nZBuO15Yt/mmUeTqVikbm?= =?us-ascii?Q?pDMNNgvM9qQ4Dza0E+kCMOuRFQ2TrPx96flNrGq7+UcR0l/XYOvtfybQ+QXh?= =?us-ascii?Q?Wfkiw1izSzn7foXUMuOGW+MwkUyUYOOvSlYYJsUcjdIGsmMuopUu35SX7xkX?= =?us-ascii?Q?RHxPw37snI8SNgM3f30dzx4yDFyyFUwyTnJwlKJf6NMu1ymxwW/oG2Lau9UX?= =?us-ascii?Q?0/EYTpKiyHYF01AbG8fuU75ESlVdcapmXlspNW0/c9YH9gJalB+x8IbXrWnd?= =?us-ascii?Q?ZawwcNxIXTixwyOhhdBW7cmLcnCEVSFpkFnQEhy/gJg0WFjKdU+VscEYaboz?= =?us-ascii?Q?e6uS07uzSSYLxetw5eU92JuHzkuk0cfAGUR102R8T9FdmNCQhUfdvKeI7b92?= =?us-ascii?Q?BiGolJxBJW4Retxm8YdT9UCyks2zkbNmE4PDUm2vLMQIBo5pJEJ/JIK5SJ3W?= =?us-ascii?Q?iq0TvvntiRLDktD0NjKvKhmCnjcMQ/zRwBF4a4nPnf6H0vqPP7SDx8OoXUr9?= =?us-ascii?Q?JtjkJ0oi0/RvmCtBV3dZf5IOSLXcNctc1P4TRtB+MPsKqTmJSw2Whi63b6UX?= =?us-ascii?Q?giqNqDIpim6E+N0Mna2vkz5iXKJM9I/h3Kma/v3Ze7bEfNHlZBk3SAzz3SDP?= =?us-ascii?Q?fdFsb8YtxNBgJfP5GMOTxWXmeYG3RS3j5b/r5PPb3Ei+FKmoZajExThj4yUZ?= =?us-ascii?Q?nsT7NECVcMsLzyo8ODvLV+pZoa+SKO/bNzctiJ8X6N1PrMoou1/6GUFaYa8j?= =?us-ascii?Q?MWuKDs/+tMyiZYPbhTHf1KqEXCZETol48OI1BKn6Y6+prsKzZ7zLC4gHrd+Z?= =?us-ascii?Q?+VoxRk5R3tFa2bYf+EGh230q+baEef4v3kz/n4XNTUtgcjTOzYema0/KqPSF?= =?us-ascii?Q?k4MNoU7maFf1rGZF/bL/PIJLAOjKrLbO0S77BjyBoJBlEEs7kMyokP7ZDUWY?= =?us-ascii?Q?K/7ETxYS1xuseD7k9d+vCl+CftBYuXG9pJNYw6Llc65W6ijpMYnrs79W8jyx?= =?us-ascii?Q?CKVLngRdBeGE+VMa8JM3zCVhIh81CMf+zOxLzOYOnw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f4db9f2-7ceb-4ebb-b078-08dcaeb40867 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.9483 (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 03/11] avcodec/vvcdec: remove unnecessary perframe initializations 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: deblock, sao, alf skip, imtf, ipm, cqt_depth, cb_pos_x, cb_pos_y, cb_height, cp_mv, tb_pos_x0, tb_pos_y0, tb_width, tb_height --- libavcodec/vvc/dec.c | 63 ++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index ee009d4181..d609fc5184 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -99,9 +99,6 @@ static void ctu_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); - TL_ADD(deblock, ctu_count); - TL_ADD(sao, ctu_count); - TL_ADD(alf, ctu_count); TL_ADD(ctus, ctu_count); } @@ -114,6 +111,10 @@ static void ctu_nz_tl_init(TabList *l, VVCFrameContext *fc) const int changed = fc->tab.sz.ctu_count != ctu_count || fc->tab.sz.ctu_size != ctu_size; tl_init(l, 0, changed); + + TL_ADD(deblock, ctu_count); + TL_ADD(sao, ctu_count); + TL_ADD(alf, ctu_count); TL_ADD(slice_idx, ctu_count); TL_ADD(coeffs, ctu_count * ctu_size * VVC_MAX_SAMPLE_ARRAYS); } @@ -126,21 +127,34 @@ static void min_cb_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); - TL_ADD(skip, pic_size_in_min_cb); TL_ADD(imf, pic_size_in_min_cb); - TL_ADD(imtf, pic_size_in_min_cb); TL_ADD(imm, pic_size_in_min_cb); + + for (int i = LUMA; i <= CHROMA; i++) { + TL_ADD(cb_width[i], pic_size_in_min_cb); //is_a0_available requires this + TL_ADD(cpm[i], pic_size_in_min_cb); + }; +} + +static void min_cb_nz_tl_init(TabList *l, VVCFrameContext *fc) +{ + const VVCPPS *pps = fc->ps.pps; + const int pic_size_in_min_cb = pps ? pps->min_cb_width * pps->min_cb_height : 0; + const int changed = fc->tab.sz.pic_size_in_min_cb != pic_size_in_min_cb; + + tl_init(l, 0, changed); + + TL_ADD(skip, pic_size_in_min_cb); + TL_ADD(imtf, pic_size_in_min_cb); TL_ADD(ipm, pic_size_in_min_cb); for (int i = LUMA; i <= CHROMA; i++) { + TL_ADD(cqt_depth[i], pic_size_in_min_cb); TL_ADD(cb_pos_x[i], pic_size_in_min_cb); TL_ADD(cb_pos_y[i], pic_size_in_min_cb); - TL_ADD(cb_width[i], pic_size_in_min_cb); TL_ADD(cb_height[i], pic_size_in_min_cb); - TL_ADD(cqt_depth[i], pic_size_in_min_cb); - TL_ADD(cpm[i], pic_size_in_min_cb); TL_ADD(cp_mv[i], pic_size_in_min_cb * MAX_CONTROL_POINTS); - }; + } } static void min_pu_tl_init(TabList *l, VVCFrameContext *fc) @@ -166,22 +180,35 @@ static void min_tu_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); TL_ADD(tu_joint_cbcr_residual_flag, pic_size_in_min_tu); + + for (int i = LUMA; i <= CHROMA; i++) + TL_ADD(pcmf[i], pic_size_in_min_tu); + + for (int i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) { + TL_ADD(tu_coded_flag[i], pic_size_in_min_tu); + TL_ADD(qp[i], pic_size_in_min_tu); + + for (int vertical = 0; vertical < 2; vertical++) + TL_ADD(bs[vertical][i], pic_size_in_min_tu); + } +} + +static void min_tu_nz_tl_init(TabList *l, VVCFrameContext *fc) +{ + const VVCPPS *pps = fc->ps.pps; + const int pic_size_in_min_tu = pps ? pps->min_tu_width * pps->min_tu_height : 0; + const int changed = fc->tab.sz.pic_size_in_min_tu != pic_size_in_min_tu; + + tl_init(l, 0, changed); + for (int i = LUMA; i <= CHROMA; i++) { TL_ADD(tb_pos_x0[i], pic_size_in_min_tu); TL_ADD(tb_pos_y0[i], pic_size_in_min_tu); TL_ADD(tb_width[i], pic_size_in_min_tu); TL_ADD(tb_height[i], pic_size_in_min_tu); - TL_ADD(pcmf[i], pic_size_in_min_tu); - } - - for (int i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) { - TL_ADD(tu_coded_flag[i], pic_size_in_min_tu); - TL_ADD(qp[i], pic_size_in_min_tu); } for (int vertical = 0; vertical < 2; vertical++) { - for (int j = 0; j < VVC_MAX_SAMPLE_ARRAYS; j++) - 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); } @@ -283,8 +310,10 @@ static int frame_context_for_each_tl(VVCFrameContext *fc, int (*unary_fn)(TabLis ctu_tl_init, ctu_nz_tl_init, min_cb_tl_init, + min_cb_nz_tl_init, min_pu_tl_init, min_tu_tl_init, + min_tu_nz_tl_init, pixel_buffer_nz_tl_init, msm_tl_init, ispmf_tl_init, -- 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".