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 0F1A64B35A for ; Tue, 4 Jun 2024 12:05:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C4B668D711; Tue, 4 Jun 2024 15:05:14 +0300 (EEST) Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2047.outbound.protection.outlook.com [40.92.52.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62F3968D704 for ; Tue, 4 Jun 2024 15:05:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I2WgmDzh3y79o7rU/hkJy+bsXqw4ZwymOfyEqnaYjbEc9bPKAhaowuhHOzThqJoZ/I2azFWtWep+HHgPnNAVldDrcqpHA/uTO6zKDNh4SK0MQMAAb71TFFpAkhHcsJmjZ7pjJMx3UCFAdE2VachHalY+K0M5AtfF02+yLcuPyDoE4XTCtpD3JfQuudNKYFFCrktcZZbHV7I/Fs/BiAMRclNWikLof/SYVXKH1Zig9e+txBDx1aBdPlddmnWoANH7WZT8cM7EBFBElydwGV33VAR9msMSdxjYxnNyRsMew54mO3axD8rWzibYTdsCDM2KqqRhwHwE7Rzh2XLHfh/4CA== 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=Izr84BhO1ZjAZKZy2atdYQNRXs1fwfH9GOmrd67JyQ4=; b=Femk+uIJjHsyqZ29k3Mh5O+SPFsZboA0rTxnGvtNpttoCZ0POK0ZsH2ow0FFy5SbX4XnWR81Y5VFHQPOjR0W/baDlz3pn783YUoql0qmvyK7ZD++izw2eq6OOA5lwglK/043CSYHNlEWnFNvo6jbQrOJsWXCLMTCYrRmARsJmFLjo2uVkZwEsrIRRlryk2wZYEvnM6UtiVqAzJ0fJj6nTRETym/y56S3D1pKEeK3nZKoHZfUMlwnnHiu1+DPqQUgOMD4vSC+hIGMFkC6A2CmyaAi8SXILm/D5T/k9/MO2lrDD3lwzdoft8zKITMb9PC+60jH29RfwQq6ws1mlheOKQ== 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=Izr84BhO1ZjAZKZy2atdYQNRXs1fwfH9GOmrd67JyQ4=; b=nBmQznLcifKXlTqJIkRSFJHMONpqid9T829ByhtOjHPKYIxGIy7wfw22vEfnitu/sB/dzYXIbSQrAXAiOSPCzvwGElrhrgg/ezM7tGWvjupuWoZGi+zmjD7YVoFQ+tauGMe5oOfFkm88T6z1LuJX/ZvMwdu7DLYf5GjJQHr6bDFWx5/aldj/EKi1QqpwaEw88bvaYNZbG6ZRCL/BAdh7MrLwD5H304/swalkRI6EWPdYECc3MR7DMEkbq+v9W+4BLM8RMb5MrV3OT6nlln4uBVLyKHRB4IkbuV5YJKJx/Z3/kO8P7ApMH2FU0aqe7XgCctXs5iTTl07jko82W/smtw== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by SEZPR06MB7187.apcprd06.prod.outlook.com (2603:1096:101:234::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 4 Jun 2024 12:04:50 +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.7633.021; Tue, 4 Jun 2024 12:04:50 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 20:04:11 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240604120411.435626-1-nuomi2021@gmail.com> References: <20240604120411.435626-1-nuomi2021@gmail.com> X-TMN: [1lCG1m/bq8FO8pEtO1Ko/SUGE3Jk2Adb] X-ClientProxiedBy: TYCP286CA0038.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::9) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240604120411.435626-5-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|SEZPR06MB7187:EE_ X-MS-Office365-Filtering-Correlation-Id: c12a5550-e866-48f3-e88f-08dc848e88e7 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1602099003|1710799017; X-Microsoft-Antispam-Message-Info: +ASIqHGvmt2+avgeF/5S7ZJ3gg7H1JwkxLESBju2Js1U7okNhSsyiQEDxxbX1IYb7VZWIa/lFD6imLaR4nTwibqOMZO9lrlAGzw0amJqFFYucGQvfPTtW2F4iIGh634+eLCdrIC6OgbXA+30r+P8yEtXhyTbjrzhv53SqR+5gbRVeuJop3rnp89gk4/QRnZ6KxikHCO5PF5SZTizVfe3pP3KM9ohJWrLvxTAUS5x9RB9k20qc3OEmX+DXPsFBw4h/115y9d/L9a0eh6AVQYa+H+6XZd2r/nPh1nuqWttQChDNOdL06t0rldsCPf09k1GyPCpR/+jRZGd6gcdY8HKzXzi29SYpDmcI4QZVDC8FR3sDPqqS+faqHlH94quuthRF7s/PWV/olnwQrE/sHMr+gDoD/kjDYbonLjrQIslCC8eqgjF/VxPXwAR3fheJpMVDNSQRvy7mB80c8ZT6XgbdKLAHFMBtpklfcgaKnMI6j202vNK6Yisyz1VbRu/WbuDWVOtpU0KFM1eD2uIlnsGU9JTcUZpjqAKDXrRTW64r31RsdW9j7rXxgt/4aatzgxE0fbfpzbMg4L5rccAwerk3qdZgcLHm7NsDaSjnfotEqEC0tBFWPF6iE8xzXCgHHTXWy+1EpiM6GXhR4lEi/tdHmq0p/82ScwaRiHW6QMXVPj4dAzwoABJy2QeT6sSIbe1/gK7Y6PxLXl3YJgHdtvsDAzJgz/PLCWisS64PWHzRO0aN1cVnIIB8a9060fpDd7p X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PUf9gTLfp3mltJwHOtCzSaWHOZEwpwPQU4FHVNxu/F7tS9KelWYbHEY5MYBf?= =?us-ascii?Q?J3OD700A/MGF5PrPghNRKxZdlCsY1jIeKzxgu0JUkPGqm6Kt7xhC8PtOpSPP?= =?us-ascii?Q?S+KFIH2Am0MpySEBU3zWNjVm61mx5qe4iMyMLISVUv3zdm7yJy1drjQDE7ma?= =?us-ascii?Q?VFP212On1OZEgIh087B8KFLiSop2mzmlrMSdKAllKpgCoY9r8Ehwd6VUlFL5?= =?us-ascii?Q?mISFc0TeyFFercHA/cEMw24kMiFiZsO8oFsRwz9QYfIdjI1KGHPeK3oa4uQO?= =?us-ascii?Q?diwdy2NofPQ/z3wJiu0HqKLyNgfZcZFdMmTYaFETcJFsiaAfoyeKV/z0OHWu?= =?us-ascii?Q?WZa9ujkRBP9Mu4XIQWYasJHTDi/w+qA3fV476cbtYafEVvXhwWYQEINpbHGf?= =?us-ascii?Q?r70Df5hlj34YXDAr9xTc2JgIjkq7w9lnUANjo/CfWrcWcgtBjq/AOKpljjXH?= =?us-ascii?Q?eo9AnEALC+JbwqUvMRGKYzcKSlMWPw88AAgnKEC4K3tyP+3ErsZjQEEuQFAW?= =?us-ascii?Q?ZtW7XrtMb9/Wvpq1xjc1KRUmMHIPdALt/egT+aln1CbKWC0yx+HcatK0QkCT?= =?us-ascii?Q?YflIOl0h/X9kwxrOtbw47rFqyB1YYedpfW6lHYqBB9w3xhGuA7Qg4LvqfGNb?= =?us-ascii?Q?zTx13WxTo+0HgabnL+hDep0tBKrSQA6aUp9KaaXG+3DmjwCuOSp91VG2Rjyr?= =?us-ascii?Q?+X/RS+8L3hX68bV3DIh5RTtDJ/Aoza8svVDUV/cFUZ08UGJUsDDfIgdhISXH?= =?us-ascii?Q?2E7Y7gzYQZCMeXuSYJuRQYHmS4w4a5J8F7NaWKSxpikvt/YUcMX6TZR4l4pA?= =?us-ascii?Q?QOdv3jBzwP6UZq4coIWp+TyBX2wkWicBW/joQ9NhX+K9KdCekPWj41T8jWtf?= =?us-ascii?Q?4tkch3FIz14JBWpk+3YRxmK2+p3QZdkIg7HvFdjpfVPJ/pQ+LLDIZr5ap7OE?= =?us-ascii?Q?ohttIXQZWUYKUpBRnZC/f+mlDR7XdY4yWx+hNMEWeVQFm/e5zPrYZTpjNldS?= =?us-ascii?Q?4eQr1UJTKlO6qZdbbOYGv4swLh7vpvXn7uGMvRjI/yxDhDTCeLb2dHUX/Pdq?= =?us-ascii?Q?6THY0G0ulJuvDhSrE9otV5Tjm63tJLuGM01/JjeZ6L8b+rYdxHJOp/3qhaYF?= =?us-ascii?Q?1WKc+n9rObre/6DWiJXq5dOZFfBDF/pMWrpllU8jZ7huzL5HsXOWTN9+yGOp?= =?us-ascii?Q?zcHJVW6qKtmZe3oO0nFUysLn5elbbvXHhjDTb/KRi8PKBHRSWK4dPAbtjaXF?= =?us-ascii?Q?MMn6wEfg+Co944thNa30UhsDmW6+JO66wcNHxuNVRg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c12a5550-e866-48f3-e88f-08dc848e88e7 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 12:04:49.8850 (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: SEZPR06MB7187 Subject: [FFmpeg-devel] [PATCH v2 5/5] avcodec/vvcdec: support mv wraparound 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: benjamin.bross@hhi.fraunhofer.de, 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: A 360 video specific tool see https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=9503377 passed files: DMVR_A_Huawei_3.bit WRAP_D_InterDigital_4.bit WRAP_A_InterDigital_4.bit WRAP_B_InterDigital_4.bit WRAP_C_InterDigital_4.bit ERP_A_MediaTek_3.bit --- libavcodec/vvc/inter.c | 81 ++++++++++++++++++++++++- tests/ref/fate/vvc-conformance-WRAP_A_4 | 16 ++--- 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c index 09575eb2b4..98cb43322f 100644 --- a/libavcodec/vvc/inter.c +++ b/libavcodec/vvc/inter.c @@ -95,20 +95,97 @@ static void emulated_edge_no_wrap(const VVCLocalContext *lc, uint8_t *dst, } } +static void emulated_half(const VVCLocalContext *lc, uint8_t *dst, const ptrdiff_t dst_stride, + const uint8_t *src, const ptrdiff_t src_stride, const int ps, + int x_off, int y_off, const int block_w, const int block_h, + const VVCRect *subpic,const VVCRect *half_sb, const int dmvr_clip) +{ + const VVCFrameContext *fc = lc->fc; + int pic_width, pic_height; + + src += y_off * src_stride + x_off * (1 << ps); + + clip_to_subpic(&x_off, &y_off, &pic_width, &pic_height, subpic, half_sb, dmvr_clip); + + fc->vdsp.emulated_edge_mc(dst, src, dst_stride, src_stride, + block_w, block_h, x_off, y_off, pic_width, pic_height); +} + +static void sb_set_lr(VVCRect *sb, const int l, const int r) +{ + sb->l = l; + sb->r = r; +} + +static void sb_wrap(VVCRect *sb, const int wrap) +{ + sb_set_lr(sb, sb->l + wrap, sb->r + wrap); +} + static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst, const uint8_t **src, ptrdiff_t *src_stride, const VVCFrame *src_frame, int x_sb, int y_sb, int x_off, int y_off, int block_w, int block_h, const int wrap_enabled, const int is_chroma, const int extra_before, const int extra_after) { + const VVCSPS *sps = src_frame->sps; + const VVCPPS *pps = src_frame->pps; + const int ps = sps->pixel_shift; const int subpic_idx = lc->sc->sh.r->curr_subpic_idx; + const int extra = extra_before + extra_after; const int dmvr_clip = x_sb != x_off || y_sb != y_off; + const int dmvr_left = FFMAX(x_off, x_sb) - extra_before; + const int dmvr_right = FFMIN(x_off, x_sb) + block_w + extra_after; + const int left = x_off - extra_before; + const int top = y_off - extra_before; + const int pic_width = pps->width >> sps->hshift[is_chroma]; + const int wrap = pps->ref_wraparound_offset << (sps->min_cb_log2_size_y - sps->hshift[is_chroma]); + const ptrdiff_t dst_stride = EDGE_EMU_BUFFER_STRIDE << ps; VVCRect sb = { x_sb - extra_before, y_sb - extra_before, x_sb + block_w + extra_after, y_sb + block_h + extra_after }; VVCRect subpic; subpic_get_rect(&subpic, src_frame, subpic_idx, is_chroma); - return emulated_edge_no_wrap(lc, dst, src, src_stride, - x_off, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip); + if (!wrap_enabled || (dmvr_left >= 0 && dmvr_right <= pic_width)) { + return emulated_edge_no_wrap(lc, dst, src, src_stride, + x_off, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip); + } + if (dmvr_right <= 0) { + sb_wrap(&sb, wrap); + return emulated_edge_no_wrap(lc, dst, src, src_stride, + x_off + wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip); + } + if (dmvr_left >= pic_width) { + sb_wrap(&sb, -wrap); + return emulated_edge_no_wrap(lc, dst, src, src_stride, + x_off - wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip); + } + + block_w += extra; + block_h += extra; + + // half block are wrapped + if (dmvr_left < 0 ) { + const int w = -left; + VVCRect half_sb = { sb.l + wrap, sb.t, 0 + wrap, sb.b }; + emulated_half(lc, dst, dst_stride, *src, *src_stride, ps, + left + wrap, top, w, block_h, &subpic, &half_sb, dmvr_clip); + + sb_set_lr(&half_sb, 0, sb.r); + emulated_half(lc, dst + (w << ps), dst_stride, *src, *src_stride, ps, + 0, top, block_w - w, block_h, &subpic, &half_sb, dmvr_clip); + } else { + const int w = pic_width - left; + VVCRect half_sb = { sb.l, sb.t, pic_width, sb.b }; + emulated_half(lc, dst, dst_stride, *src, *src_stride, ps, + left, top, w, block_h, &subpic, &half_sb, dmvr_clip); + + sb_set_lr(&half_sb, pic_width - wrap, sb.r - wrap); + emulated_half(lc, dst + (w << ps), dst_stride, *src, *src_stride, ps, + pic_width - wrap , top, block_w - w, block_h, &subpic, &half_sb, dmvr_clip); + } + + *src = dst + extra_before * dst_stride + (extra_before << ps); + *src_stride = dst_stride; } #define MC_EMULATED_EDGE(dst, src, src_stride, x_off, y_off) \ diff --git a/tests/ref/fate/vvc-conformance-WRAP_A_4 b/tests/ref/fate/vvc-conformance-WRAP_A_4 index 7273880c2d..7f69d5e029 100644 --- a/tests/ref/fate/vvc-conformance-WRAP_A_4 +++ b/tests/ref/fate/vvc-conformance-WRAP_A_4 @@ -4,11 +4,11 @@ #dimensions 0: 1680x832 #sar 0: 0/1 0, 0, 0, 1, 4193280, 0xbd70f1b3 -0, 1, 1, 1, 4193280, 0x64e160d5 -0, 2, 2, 1, 4193280, 0xd20722ea -0, 3, 3, 1, 4193280, 0xa1d00055 -0, 4, 4, 1, 4193280, 0xe3dcb9cd -0, 5, 5, 1, 4193280, 0xcf97b6cf -0, 6, 6, 1, 4193280, 0xd87b73d0 -0, 7, 7, 1, 4193280, 0x0f8ee2bc -0, 8, 8, 1, 4193280, 0x76607ca4 +0, 1, 1, 1, 4193280, 0x491104c9 +0, 2, 2, 1, 4193280, 0xf600c2c1 +0, 3, 3, 1, 4193280, 0x1e3c8e2b +0, 4, 4, 1, 4193280, 0xad275e45 +0, 5, 5, 1, 4193280, 0xcd6103d7 +0, 6, 6, 1, 4193280, 0x0ec8cfbd +0, 7, 7, 1, 4193280, 0x2f664486 +0, 8, 8, 1, 4193280, 0x543eb3fc -- 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".