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 37D224ACB3 for ; Sun, 19 May 2024 13:39:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C4CE68CADA; Sun, 19 May 2024 16:39:44 +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 1879868C66F for ; Sun, 19 May 2024 16:39:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ngocb5VkIw5Quk/SXqQDWn7BWZbcfZAEsTr58Om85fPA3sUCCkG1ED9O66pCdEY30N/g7tArm6JExZPHYbz2ZXnU9k+pObGRUwyQysXFYvt21H4uDyu1pSR/c/FjcsT8J1C0ktIDDG95txQPcnrZraqhJn10WxbDTlY6mAYThBkLL1d+htZEQmlsOFnQO723iiGdGCgn+zPrkuWgM/5tHGrCakhdSIVqYKvyOEIMBNEll5VSjqJP468OFQ08RewLjIbSrqNCDEh7YYezzA9cWcWyijRm7x4xehzJLTIO6Q+gGsSjbeiEjC/SVY1aasY7GEww9BeurTI3dmUvw1YYHg== 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=A19NTFh6Jx07rjGymp2Zq52Jgv+6MCEZM4AZ0aatbwQ=; b=llkG5NsFkHOMtnv9OEB0UdHBwnYrnFXGdLslsBX4/c/dulZGBns/PCZldxxx9tRLddtq5k+TWT3npAbcRo4s5lwJMqL1lzItcGkBHmBBmnylD4bLmpLuPuYO+xbCjcWg1qUNfYt3mWPMRjHeQzvc6MT/VhHNcZ82vpJiBdF6/2uxsvXcUgDYA/iJFwnGg/FugToJXaNfloGG5IROk0a3JXP831KHZhh41kmaFZIVgIYeIfe5fuDMGmTnpTtumqj4TkuWz9hFsSa07uzKpwo0QKdKxEoizk6xrCjAGwmARK3qkxZOB2SDoRjA1+9ZC4r6RLH3Yf8S82CVEEvUPwSkVw== 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=A19NTFh6Jx07rjGymp2Zq52Jgv+6MCEZM4AZ0aatbwQ=; b=D0FqCG/sXlYqbw/L4wIg3HEQZjSh+U+Nn9w6Ip4MMGAkzeUfK0vM270c3A3bw+85osCOqjDTg0mn2Ce2B1ZMbk6Apsy/eflqOh7PxHtX35ycyKEgis0VkTUuWH627Fy9uxQTBt6lLTGCJpCeTTmG44D5TdJHek8kPjDmHY5067pzfd2hcWLBgfBkDrhUaw7agDoZwjyLUF1VoF+VgX62TmdJXaUZroWwkSzZx+jGE6v0xfm85qlscJSC9R5aCIUIBLo0jkcMBmrfLS60/X8zmRukNUNCYY3w13jd+vLVld50OR+b4wABYr/zOE01VksoOwYQed3ope0L9xHIIdYgsA== 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:33 +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:33 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:27:32 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [9f5ylc9mchxJs4oJYCTJYSkkeR6sTHm+] 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-1-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: d3171631-90c8-4493-c72d-08dc78091d8d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: Vo6xH6XlXW3bTxkGzXjLDwpTO76ZNX3Vlb738v3CckGqzM7DKEsrn75GSTDMUSyc0wMB7GWV7eQevBcyc+m05uaFso/jSqcldmb3EGq2kUeNLdlnCL2UrFMGwpVR16LBMD9bMmYy7K8fPds/ppXObvden1wxAupqP7qu4v70Mnk0AiKb/5vTdmhuKMVLOYq7owxYMGAq/h1fXFEQwnfJGdHdd3gvfsBSQlDT3/AgzLuV3fyWroOFPHJCqXJNavgDaL7AOlhPqehCPZyVtbcxLAwR0TD33uqg3bdFMkeX2ZmLKGCdPkALjQKfE4tFT6ggUJ416YkIAWNIiPimmaTApC9p+fhQh8Xrp9F7JShv7BaWViEHRU948Hl/3walgFm38eq+eF7uDayYbqGkSR/G1XwcBNWju0A/1brwYGmu5KQLXZNNTEsEDljFR3oQ9IsxAE57e3RO2lABpcs10uyELdIbsMOodcKZrUy2UvQj33h8YC9KnkESzeigxFRaxg1XdbeM9M0/RfC3KBvNCeUjWzkdMNID4ggpqIIdWSYGQwqzoBGdOBLMif9F8m9013uJF2pyAhHtXYz7BaOkCLXqxxEVTIPlNM5l17Z+Ylid0pBKb5LhgApG1ZzC0xIbh0Su X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jzD19mlmqgLnqJCcGhiCH2YM/nH+jDv5Krv40iW2NupCVrPWjCgeIeJXGfqi?= =?us-ascii?Q?t5Fri1t7fhjz6oX3daTpGACCpJDDjDv07vqkY3Cu/4wkXCTAVn+0/p/KT2dT?= =?us-ascii?Q?yj27HFxnFipJEF2O8RfiEI/FTZqNYTrwBYPpXKN0qGctV22IkKYh82oIacQk?= =?us-ascii?Q?6eGZ7DF11XS+l/qSwVDcuMLSwwtmzZ92mEfXGWnKZ5FCXxofzHwwtMXv9ZXh?= =?us-ascii?Q?RKGZVSefL7g89HV4uTWeOXc8yoEtyrJ9n+g/rV3kg36yKYqDK3wXL3aegHOB?= =?us-ascii?Q?i1UeDdrrJbaOoa1IXfUg5dkJJthmc4wLfXmRi/sgXlQUAoZwX4FUbBLRbRSX?= =?us-ascii?Q?QKmd5GZCLGNJ80JL4AP0DKLrqbfE8ahhXzpUJoFd+MTYf5MAz+lm+1KLVKvZ?= =?us-ascii?Q?Iyx3XtU7a4hIchl+7QJMMq7+a/hkBih9dDD/yNxm8yFFrnjYSBc8EbrgEwsI?= =?us-ascii?Q?FUHabBFK3Fy4hKxG72nwUsvF6c6LzQPx3A2eumeoxcmdSeNRiL5Yc8jUzQl3?= =?us-ascii?Q?b0RsDHHhW/Jhi8NbEOCanIVKLKjC1b7lOUKOz2/IOjyFJOqwCcY7Z5nCLJdK?= =?us-ascii?Q?1vxq7j3pfnwTOUT5bLsbQyBO2ZIiKkokVCICT47nDLwbCJi9i/glf4h7Oi42?= =?us-ascii?Q?E3X8RIrWcWes/KIBQFT57bf2GvcyA2AXyAW5+MMJK38dsmiH1y7b1v12kOiA?= =?us-ascii?Q?YKA3zFB5FwrX5ql+d6lV2+DcJAs6Ex/tHmwx6XGtr2HqEiJLrSujyWWcTqSr?= =?us-ascii?Q?8pPkFC+D7WBFnU/m1+qOniVUUMYsg13mgcY/x1AeeiCmcmW68uM5TGTuqpcN?= =?us-ascii?Q?f/Ri5OWwxhKyd5OjHoFyReNyevNe6TeYMvzqAIz18tjg9NWVnLeek2VgwzzY?= =?us-ascii?Q?rtGtWgYWHeyMxyHGavttHM2S41kiw8X9uVuTA1084M6L4yUIVirf7ph7Kfkf?= =?us-ascii?Q?KZfZb9jgO1K9LE1ntW0TyHIkGmWb30Bk/RwKehrqLfa8XAZNpNs1a0ThcGts?= =?us-ascii?Q?Eii9qGkGp7weFluo2VMzsSoqCc5ytCcNJmDllEwFhLlVUT2o4meyyykvofH+?= =?us-ascii?Q?PPgclGioWUPQxj1DozYdEs7DtEcVJbiyHgPkIzltGN/7FKXQG8C5SQ5+1/3L?= =?us-ascii?Q?d/Ji3/VP6mwasQ2H8LFt0n129kIVHQxD1Z5UyHUqrA79kPJfcaQ/2kYJphuU?= =?us-ascii?Q?eVAtl2qVN9HjI5AykxxLTGgxgHdyca9dsuJqvPdPneVbv8B8HC8Tkh+plE/x?= =?us-ascii?Q?MI+syzBgOs2/yaGC38ucnbMMY6rk8Z0LF/ihxDGpYg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3171631-90c8-4493-c72d-08dc78091d8d 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:32.9468 (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 01/18] avcodec/vvcdec: misc, inter, use is_chroma instead of is_luma 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 | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index 4a8d1d866a..3f0718cb5a 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -31,33 +31,33 @@ static const int bcw_w_lut[] = {4, 5, 3, 10, -2}; static void subpic_offset(int *x_off, int *y_off, - const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_luma) + const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_chroma) { - *x_off -= pps->subpic_x[subpic_idx] >> sps->hshift[!is_luma]; - *y_off -= pps->subpic_y[subpic_idx] >> sps->vshift[!is_luma]; + *x_off -= pps->subpic_x[subpic_idx] >> sps->hshift[is_chroma]; + *y_off -= pps->subpic_y[subpic_idx] >> sps->vshift[is_chroma]; } static void subpic_width_height(int *pic_width, int *pic_height, - const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_luma) + const VVCSPS *sps, const VVCPPS *pps, const int subpic_idx, const int is_chroma) { - *pic_width = pps->subpic_width[subpic_idx] >> sps->hshift[!is_luma]; - *pic_height = pps->subpic_height[subpic_idx] >> sps->vshift[!is_luma]; + *pic_width = pps->subpic_width[subpic_idx] >> sps->hshift[is_chroma]; + *pic_height = pps->subpic_height[subpic_idx] >> sps->vshift[is_chroma]; } static int emulated_edge(const VVCLocalContext *lc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride, - int x_off, int y_off, const int block_w, const int block_h, const int is_luma) + int x_off, int y_off, const int block_w, const int block_h, const int is_chroma) { const VVCFrameContext *fc = lc->fc; const VVCSPS *sps = fc->ps.sps; const VVCPPS *pps = fc->ps.pps; const int subpic_idx = lc->sc->sh.r->curr_subpic_idx; - const int extra_before = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE; - const int extra_after = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER; - const int extra = is_luma ? LUMA_EXTRA : CHROMA_EXTRA; + const int extra_before = is_chroma ? CHROMA_EXTRA_BEFORE : LUMA_EXTRA_BEFORE; + const int extra_after = is_chroma ? CHROMA_EXTRA_AFTER : LUMA_EXTRA_AFTER; + const int extra = is_chroma ? CHROMA_EXTRA : LUMA_EXTRA; int pic_width, pic_height; - subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_luma); - subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_luma); + subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_chroma); + subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_chroma); if (x_off < extra_before || y_off < extra_before || x_off >= pic_width - block_w - extra_after || @@ -78,20 +78,20 @@ static int emulated_edge(const VVCLocalContext *lc, uint8_t *dst, const uint8_t } static void emulated_edge_dmvr(const VVCLocalContext *lc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride, - int x_sb, int y_sb, int x_off, int y_off, const int block_w, const int block_h, const int is_luma) + int x_sb, int y_sb, int x_off, int y_off, const int block_w, const int block_h, const int is_chroma) { const VVCFrameContext *fc = lc->fc; const VVCSPS *sps = fc->ps.sps; const VVCPPS *pps = fc->ps.pps; const int subpic_idx = lc->sc->sh.r->curr_subpic_idx; - const int extra_before = is_luma ? LUMA_EXTRA_BEFORE : CHROMA_EXTRA_BEFORE; - const int extra_after = is_luma ? LUMA_EXTRA_AFTER : CHROMA_EXTRA_AFTER; - const int extra = is_luma ? LUMA_EXTRA : CHROMA_EXTRA; + const int extra_before = is_chroma ? CHROMA_EXTRA_BEFORE : LUMA_EXTRA_BEFORE; + const int extra_after = is_chroma ? CHROMA_EXTRA_AFTER : LUMA_EXTRA_AFTER; + const int extra = is_chroma ? CHROMA_EXTRA : LUMA_EXTRA; int pic_width, pic_height; - subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_luma); - subpic_offset(&x_sb, &y_sb, sps, pps, subpic_idx, is_luma); - subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_luma); + subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, is_chroma); + subpic_offset(&x_sb, &y_sb, sps, pps, subpic_idx, is_chroma); + subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, is_chroma); if (x_off < extra_before || y_off < extra_before || x_off >= pic_width - block_w - extra_after || @@ -124,8 +124,8 @@ static void emulated_edge_bilinear(const VVCLocalContext *lc, uint8_t *dst, cons const int subpic_idx = lc->sc->sh.r->curr_subpic_idx; int pic_width, pic_height; - subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, 1); - subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, 1); + subpic_offset(&x_off, &y_off, sps, pps, subpic_idx, 0); + subpic_width_height(&pic_width, &pic_height, sps, pps, subpic_idx, 0); if (x_off < BILINEAR_EXTRA_BEFORE || y_off < BILINEAR_EXTRA_BEFORE || x_off >= pic_width - block_w - BILINEAR_EXTRA_AFTER || @@ -144,16 +144,16 @@ static void emulated_edge_bilinear(const VVCLocalContext *lc, uint8_t *dst, cons #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, 1) + 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, 0) + emulated_edge(lc, dst, src, src_stride, x_off, y_off, block_w, block_h, 1) #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, 1) + 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, 0) + 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) \ emulated_edge_bilinear(lc, dst, src, src_stride, x_off, y_off, pred_w, pred_h) -- 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".