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 183404ACB5 for ; Sun, 19 May 2024 13:40:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B77068CFCE; Sun, 19 May 2024 16:39:55 +0300 (EEST) Received: from SINPR02CU002.outbound.protection.outlook.com (mail-southeastasiaazolkn19011003.outbound.protection.outlook.com [52.103.65.3]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40F8968CDAC for ; Sun, 19 May 2024 16:39:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7UHDOcf0kJrSQCx3V4hE34piFtPvI/jnbv081A+SbDQsb+x7siHTFe3v/Ch+GCFLrECetOfq3bYvsRWzfDTFbKGJ6YzIBM5KPXlgitsXqYQpDpq1cPUPIBc369NTXGeHBoLzGFMdDFXiK7FuOc6J2H2KghEO550GFWb0uAL2traV9f/zYG505lpp/byLhZg3+un04miTYgq+ADF9AG2ADcmQqZQBNWwMQnGTWYnHMNb5u5kZni3/Z89s1TJ1N5FqIyl4/eDr1fxMEHZ+U/NZuhoJCIIqIBtfxpaodZRvu8RiSMqL3QVe2t2MpQ6X74RHRYLhtOt9zbrAi9sou8iEw== 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=Zd4/uKaEzeNnzVIoMCPbFaP2pw3RyddkHYGUcPQAbTQ=; b=NqP5alITzgvKGWfLypM+UJin4BDhcBRF0Eq2jHyu/uZCgTqOYCMuOFQe4GqQ4MF9DCvIIL5P7wka1kF+KrHx0A+INHXOAhCPoRnNmtQGDzMWK7iVjBSTtoxanxxU//IfBL+axliOB24HF9Ejhi7YSTrrScYdM4EUj0jCgJb2772wRjaDVVb+G5HH+AOyhdzl6W7K4YEo8eP067WnAY26YnQ7jnJsJ4WMrv1SKLybtMlk5/ZQ0CtjTLDoOTgWFh5HasGDgGuRbut23aqy59trFrOmwTWki6CB0ElpdE3/oFgZLOh2hBO1mIdiuaoPx0OpvF8OyEPBnio2zAQeDRiuoQ== 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=Zd4/uKaEzeNnzVIoMCPbFaP2pw3RyddkHYGUcPQAbTQ=; b=szK/ww+Xl0q5YFn4DgFz2aFU1L9AKQG+vscNhjNu7MOLbZNYWSsp/ob2srPfkipRjWC0zFZPGT/5axooo+LsooQAThYS+a9MTrkrVuAjjRbzmeXGmsw5FwCUmtSi7tXhpJFinAGNqjlObsoooAICry8qAZjtTEpCerNuQX08vzBXxlQXPrgRQtkVH6RksC/2Pb+EbnV6+lX2Q7oyY4Ev/ZuPp52wJSfGJ9ox5W96csX7t9vzmEPIsYhrkZeYN9qhWJl5M00hlOpb8vnKmn4tWzTaLZcRe0km7nvZZrvcir5/e7dpMTK1NCl9rIt8oXd+KLxooL/r34TYt1JB5WzS8g== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB6098.apcprd06.prod.outlook.com (2603:1096:400:358::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.34; Sun, 19 May 2024 13:39:36 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%4]) with mapi id 15.20.7587.030; Sun, 19 May 2024 13:39:36 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:27:36 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240519132749.790832-1-nuomi2021@gmail.com> References: <20240519132749.790832-1-nuomi2021@gmail.com> X-TMN: [iQ9ASoJE7DivF4WHyilVSQIdA9C7kbh/] X-ClientProxiedBy: TYCP301CA0017.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::8) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240519132749.790832-5-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB6098:EE_ X-MS-Office365-Filtering-Correlation-Id: fe0f7cda-7884-4d47-5faa-08dc78091f9a X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: TSVt4G1Du21VnWEQ8E9ppI7zHFM+uSV97MNMm5UKHVrPfKcIGSubAr3U5mgBFLgI0110lZMuuDyoMg7anfJqSewkpDP4I9HxgsDCjnRHKsusBmS/jydBeJo6du29CsFDKb2bCiZ+jiKBmLZf5+e/QvuvBKrgKA0ogV/WDhegApxS+bKEnoJA8oQr6t9pYQnRKprc6n7EBhW/TCoQ+2Sd0mU/9bDwwjh55dy6kNFHmFhmKicMCYWPYEj+mAqFlkUTpSAh4dua+e+VxWaB8hbljPJlBVpvYhbfUL/jTMZ36TYxB3VQJo7/TLz+IzX2fjh2JpW91++EwbZyU6AQT1s5Po8AETUoJbjtbXsMraqJltmt4PnEU01v7WHaConJRB4zb/g7qXXCA+yBdacmVvlfxPz7QllC3+iubhKVsNyd4s4TIjl3R6gqH/R9rKPZZbgUHNnijrB1EU7Zqt4o80a+gp2F+6eHsWhzvnHO2I5g8HceYsPOEfZd6B07TW0S1v4Kq5ii6fvH1z6yYRk+tGiccsEhc/tOPsBdy26KZ3jjvP8Yx9Llah5G8RP0PloWSks3DPtMJn8JVuItQuFRL7zKsXOE04wdspUDVQmptZtFy0XG9LYTy8SYSIb0iexlI5DY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vCYGd/rKCNRVFmPbLFE6GOez8YG41irMqrUCPnj9sIaFiygx29bEioEZVNNk?= =?us-ascii?Q?voK8EooA0icsVNTBqmAaSWWYxESdoStIUQ0IVf0T5V30HDiK4G5TIFIKsyvq?= =?us-ascii?Q?vegnjqezGNdrf7V+uEjuHDc+di9COcAkc2rwxLAG9aRseIeRTWSmhVs3nstH?= =?us-ascii?Q?ybi1//0kShvWFT17pQCdG+HC9GKIRwPOAIr2xYn1wrTsgrBV3gAlBqGRfqqW?= =?us-ascii?Q?m/GqjR8FWOcjwlhDZnEGUxN68ejXcC9nbWWxYW8t4/HAnywW/7qHZcoXqQx+?= =?us-ascii?Q?KFWpzr6XZZRQV2k9j1MGjkxJom87jMY1SzAtrH+Lh1a1OWErHwiMY8jh8Jgw?= =?us-ascii?Q?+N4ZuasftewuMzLuYQZxpAyL8lyL7HCNRBZtSzvwSVlLoemIRVwQ9uTv1Noi?= =?us-ascii?Q?BTL8iVI/zaO4Rj1rxd0BtXmv7p88IJBOIGag/AMDWluvkQyYIgGD9cgg8LrL?= =?us-ascii?Q?sqNjdnl9sdUuUS6KHnl7UEbN25A0K/GLpm0+u82jcr6WICyJU/XxkVx+kFKq?= =?us-ascii?Q?HP1BOE7bq9kQaa33Uhxw22eKmjTEeAUdmGe2sY8v8YQ2txTstScxcjhWwgSB?= =?us-ascii?Q?+bZhg5rG4ah3aeUpb6Z9rWsAgff10+qdF1AK49z8RQiyWa6dNtmyFM+7l//H?= =?us-ascii?Q?HoiINZsOpP6kPDXmB/HHd7xAgY0Qey1EQkp8JCo/q61luzz0Ny+ZsmOlU0+d?= =?us-ascii?Q?rlXyyWn7lym69DQjbPKd05v8U6pA2sRylmNLicZn9ur7eCxfRFF/rBDhbvZT?= =?us-ascii?Q?nmUYELBV3ICQa2f6wrSWv9mfmLwcgq7uIlAOW7n+Dtl5fQ7nMGmXJXx1PdDs?= =?us-ascii?Q?iEkpSWqgPp44wultptniXV3Luz4u8eCO0YBb7pt0DK2ly4J6HWFh8xDYXGod?= =?us-ascii?Q?/eiBSsStc0GmZBcIV9iUBAvRkk4HY6IDjToQ5/wq27FJt3aHAX8fhIwgN+aX?= =?us-ascii?Q?nNt7UlOtcT0S8+UHedGtVjqn0vCdhs4bzFfb/tCtdAk65UZWrifTNeBLLIUd?= =?us-ascii?Q?iwSf83gOMADlRVXNv0/GaAcT2iB5sOe23EekC+saW3OGWD4P9F9tc6uZOLkA?= =?us-ascii?Q?SI+Dx2QbxtYbqXvqYPeZTr3jbKrs0kbp56Hj/MqrVW1O1zgab0cSFMFIiEhB?= =?us-ascii?Q?capwjb7S+DRWo+vtC7b0iC4+MVoQLlE/B3Z6Z9oIfY6Vuxe37avu9kC/ze2X?= =?us-ascii?Q?tBZN4QCucDILmONmEfZ7/o6xX4mzdrKl3zwfL6RgKWOABxSJTp6VNUJx2lFJ?= =?us-ascii?Q?gyovmfnn9/Lrkfkmetd14eXfqbaqcwLmCZb5i6wU0g=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe0f7cda-7884-4d47-5faa-08dc78091f9a X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2024 13:39:36.1962 (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: TYUPR06MB6098 Subject: [FFmpeg-devel] [PATCH 05/18] avcodec/vvcdec: misc, remove unused EMULATED_EDGE_{LUMA, CHROMA}, EMULATED_EDGE_DMVR_{LUAM, CHROMA} 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/inter.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index 9132bfaee2..cc93184ca0 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -142,25 +142,13 @@ static void emulated_edge_bilinear(const VVCLocalContext *lc, uint8_t *dst, cons } } -#define MC_EMULATED_EDGE(dst, src, src_stride, x_off, y_off) \ +#define MC_EMULATED_EDGE(dst, src, src_stride, x_off, y_off) \ emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, is_chroma) -#define EMULATED_EDGE_LUMA(dst, src, src_stride, x_off, y_off) \ - emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 0) - -#define EMULATED_EDGE_CHROMA(dst, src, src_stride, x_off, y_off) \ - emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 1) - #define MC_EMULATED_EDGE_DMVR(dst, src, src_stride, x_sb, y_sb, x_off, y_off) \ emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, is_chroma) -#define EMULATED_EDGE_DMVR_LUMA(dst, src, src_stride, x_sb, y_sb, x_off, y_off) \ - emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 0) - -#define EMULATED_EDGE_DMVR_CHROMA(dst, src, src_stride, x_sb, y_sb, x_off, y_off) \ - emulated_edge_dmvr(lc, dst, src, src_stride, x_sb, y_sb, x_off, y_off, block_w, block_h, 1) - -#define EMULATED_EDGE_BILINEAR(dst, src, src_stride, x_off, y_off) \ +#define MC_EMULATED_EDGE_BILINEAR(dst, src, src_stride, x_off, y_off) \ emulated_edge_bilinear(lc, dst, src, src_stride, x_off, y_off, pred_w, pred_h) // part of 8.5.6.6 Weighted sample prediction process @@ -336,12 +324,13 @@ static void luma_prof_uni(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst const int8_t *vf = ff_vvc_inter_luma_filters[2][my]; int denom, wx, ox; const int weight_flag = derive_weight_uni(&denom, &wx, &ox, lc, mvf, LUMA); + const int is_chroma = 0; x_off += mv->x >> 4; y_off += mv->y >> 4; src += y_off * src_stride + (x_off * (1 << fc->ps.sps->pixel_shift)); - EMULATED_EDGE_LUMA(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off); + MC_EMULATED_EDGE(lc->edge_emu_buffer, &src, &src_stride, x_off, y_off); if (cb_prof_flag) { fc->vvcdsp.inter.put[LUMA][idx][!!my][!!mx](prof_tmp, src, src_stride, AFFINE_MIN_BLOCK_SIZE, hf, vf, AFFINE_MIN_BLOCK_SIZE); fc->vvcdsp.inter.fetch_samples(prof_tmp, src, src_stride, mx, my); @@ -369,6 +358,7 @@ static void luma_prof_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_ const int idx = av_log2(block_w) - 1; int denom, w0, w1, o0, o1; const int weight_flag = derive_weight(&denom, &w0, &w1, &o0, &o1, lc, mvf, LUMA, 0); + const int is_chroma = 0; for (int i = L0; i <= L1; i++) { const Mv *mv = mvf->mv + i; @@ -381,7 +371,7 @@ static void luma_prof_bi(VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_ const int8_t *hf = ff_vvc_inter_luma_filters[2][mx]; const int8_t *vf = ff_vvc_inter_luma_filters[2][my]; - EMULATED_EDGE_LUMA(lc->edge_emu_buffer, &src, &src_stride, ox, oy); + MC_EMULATED_EDGE(lc->edge_emu_buffer, &src, &src_stride, ox, oy); if (!pu->cb_prof_flag[i]) { fc->vvcdsp.inter.put[LUMA][idx][!!my][!!mx](tmp[i], src, src_stride, block_h, hf, vf, block_w); } else { @@ -654,7 +644,7 @@ static void dmvr_mv_refine(VVCLocalContext *lc, MvField *mvf, MvField *orig_mv, const int oy = y_off + (mv->y >> 4) - sr_range; ptrdiff_t src_stride = ref[i]->linesize[LUMA]; const uint8_t *src = ref[i]->data[LUMA] + oy * src_stride + (ox * (1 << fc->ps.sps->pixel_shift)); - EMULATED_EDGE_BILINEAR(lc->edge_emu_buffer, &src, &src_stride, ox, oy); + MC_EMULATED_EDGE_BILINEAR(lc->edge_emu_buffer, &src, &src_stride, ox, oy); fc->vvcdsp.inter.dmvr[!!my][!!mx](tmp[i], src, src_stride, pred_h, mx, my, pred_w); } -- 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".