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 A9506490E9 for ; Mon, 3 Jun 2024 12:52:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC9C268D25B; Mon, 3 Jun 2024 15:52:43 +0300 (EEST) Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2010.outbound.protection.outlook.com [40.92.53.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F155D68D68D for ; Mon, 3 Jun 2024 15:52:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BP/muiPijYOylct59XngrZ+nFsZJfhVmJBJCI0FH1ZJPFRIy4qE1OZfGwobBobnzVqmNYuvwOdmJD5Gm05oJaM7wUOa8bkRuSB+c+6905QC8eO89bQxj+pxCgpMaj9WmKXcUPDX0pi5lvEMFkHDzqUpR23/Tcj64gNLhvmDe6CYWG/kKuxDfNBL100t+N5vSY0fHb8oao50NgGyL0yeNJ13tcN3S5ihlJ/Imzjh3wEi7G6QzlbViWDiUitNldyPXaYbRHbT5NLxXgVqAWi3PaOfVlJiE7W0vBNThn7awQanc9SHb4A0Hl2FGC9meBNNQpsY1dBKdzE/yQaf6o72nIw== 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=hKLQmExlub959p2EeAgN+SCBBv29Mv10QE2MLMg9OXQ=; b=QrbcG4Hud9Jy1MZ1g0gy1mPgLbS1ZeCnTA/QUrND02dYmF2ACCIlbVgCG1tgJzeidXevKxCRRvOlAeWJAZc2p/XHG/MJlgdsyqylGn3U9YNoquayZChpFHXMDKzizyUHozCaVwnsBEk/9Rrfy+WykrMB5+X+k4Owtl9WnvX9i4se+edywY8R78PWPP9Apc4rkbBXBlG7hzyfWsze6pDKFVnvJkkMwPgh6X3BQXrU5zKBo8LwzK2QieYFE6cxpnCPatHrNenlm42UpFZF/PsYexZBGyovLPcYw0VmUj2RFw9AewIhGMYG82YUQOT7ZImRfvXDCApthLQ7f7uAVPmfwQ== 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=hKLQmExlub959p2EeAgN+SCBBv29Mv10QE2MLMg9OXQ=; b=RauYAZ2Xl1acBC7LXONU/X+yJ1KNaeDiSU1vdfZoTfBYPRq4C8R3P7hW1NIvkTxlB6yaKsKwH7QxSrpZd/vbRJZsv6YSecQgEnOAAEzmUOm20WpVRTojle4vN4q/7mIbSohSUkoQwafYMeRPml5NbiwWwz94Po6zqiQuv2V1uomXy9i98I9rK/7zEE9fhdDgfNJy+JmKueZrT9KQpB9yTaOV75JMgSiz6D1aM+UMem8rN2Rg7Z00y0C0mfNu4qPPZ6U56YaY3ERUo5FE37mrhV3x6oZdm9Go0aTFFKSwFV/zANaMGniLQfvg2obv1LVc3DjyU1b4V2hKGeq0DcGksQ== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYUPR06MB5978.apcprd06.prod.outlook.com (2603:1096:400:358::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.23; Mon, 3 Jun 2024 12:52:11 +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; Mon, 3 Jun 2024 12:52:11 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jun 2024 20:51:16 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240603125117.10791-1-nuomi2021@gmail.com> References: <20240603125117.10791-1-nuomi2021@gmail.com> X-TMN: [VVOYbP5uoZT18E2Fqh3ISsB5bV1VRZJL] X-ClientProxiedBy: SG2PR04CA0170.apcprd04.prod.outlook.com (2603:1096:4::32) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240603125117.10791-5-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYUPR06MB5978:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c85ea9a-020f-4f71-38bc-08dc83cbfc12 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|1602099003|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: I1Q31Mnpwqrbx6WhyT4Ynx5KcCLkY2acHxzhuu4zEWybd4LiyFZsu4Yys5fnXNxn+bb+1lK333GhaqL0sHAlSfKfgt57aei6qYsJtTsxXiJKLMjfh0Nvsdrko8j7QsRi4R8+7GM1HTtT33FzqAJdCq5nVp3yBQBnGgKKuoBG9WAhh7ySUNtm1/Hbkfo7FLedZnxOKkSoKkzIO1WzOBPvuCHifVNmwzxuTmYc0iNIF9i0KBw8Qb1/2wgKKCK3wk+ZorgnAsgA0ZrVddUN8+co3YiHASzoqnREdQ8zw6WHjZbVhKEkjnLCNRlVwzEJuZsxgUvaPmUmyCXgl75QJqz2hY1N37+rgbdXw0sK20FPjN83XQ/aqi0Nt05Ss+LcQjbB4XVzU37F/Ci4CgSFWYO7P8zNDWivE4jgj2gsXPy2tIL196xoFFP9QgBCnaGn0lMfc9wD5hSGcIvuHBaHBCa02T7STbHTCstRg/f/RimP6icM0iN/tkiH4xKv4D9N43Qj68ZkRzQ2rZth8jT70CIjSU8n7nQxxBqsgtK9PvLypoH4rflu8CmkfTF4WZ/0+zAayL026izRIyRWzi+qUzdjx0VvSw0lwZ2jeKX9RR3w7AAvARRhaMeNc96mbMIfnUd3UXWCI4QWStv4/UGLaWXa1LmongVlvs5PDxEUcAJteEI9kdZR9itz+kamnnpswwlMwOK5wx8aVAKgS2mL1eetQV/riv4r9QvYHu9s1UlOPFWVnftIwzIhY8VMSR6HUcGK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TZ4+35uzZD937iFD8OjPB7mU8az8RXe0uCIEK057ehzruVW7Le6j0nA6BlUT?= =?us-ascii?Q?xNkCFCf6D+VdG9PImKVIV6wbjOMV8MdY5lJ24Swh5FvnOv589nyMTu4pbEeu?= =?us-ascii?Q?6rfzWdwjkKPheo0TRulEMfWCbJ9K35ym9rCxW3BiE18kf/j4XSLNjIMKVloV?= =?us-ascii?Q?WiQPql3FVhwOxoMRBOqemmoQ0MB5L6rbh5MuhBL05Xq2QuYORufFIHi+sbuY?= =?us-ascii?Q?UZ6MzF9U/LeHiWSAdfXkvcMQdIhT40oDcc9YvgoqqZ91FAtfc4BWkcevxI+T?= =?us-ascii?Q?LGJ3tXUFuR/U6Oo0txSkeq1Q1CD/cQCVp4T9+IpRz0PXhe4o9n6GhkGn+rmL?= =?us-ascii?Q?BjtOjOXfFgB6YrDc4luqveBVDduTYuPJZHkUgendsudvLMxQkhJ12gRF/wsX?= =?us-ascii?Q?/rbTc31sxFfMhddSyRsc5kMebbtEXvagADLzAqIaoXXdfbpvu0SYlC6w3tXn?= =?us-ascii?Q?P22hZ/l9+FtLlBAcKBofaKyGSUsQCr5rAsaXfHfPyNfp6lKTTXQfh79yT9J0?= =?us-ascii?Q?RfJeBQsr64wdDqG1dzkS0Wq8r2N4Gw8UPuC4tahsnDCal7h5Y//kWi/inOS6?= =?us-ascii?Q?kAH/BkRfYn303dGw0AvMi4WYTNgR2IoVjq0oA3mINkSmgP0aGSHOuFSDH40Z?= =?us-ascii?Q?HfslsRF5dA6p6Echx2v6u2RGBcQOT3T7P7ndZWrXJ3RlwMMa/nSlujyOcBQd?= =?us-ascii?Q?EvIqVsSdV64k+qyBQJGu9izHy+OvDU6KpmmzuCCIJT35f5nnuhBhqJUx4gTs?= =?us-ascii?Q?LqAEXpSdDenr+hyVgcUftmG5TyoH6q1lZGitdSpaKBlAdZuKuawUoBCz7ARh?= =?us-ascii?Q?tA6hWAvVdgIHv9hqfaVAMttFyOOagnNqlB8mF0gTDCl5QB6fEUvWA4+zkVHI?= =?us-ascii?Q?FxovCl9I2BiRKaK5W3OFbk8Oyv87G6yNrMcY8g0aNaLtdDlLGeqBcVBgsusE?= =?us-ascii?Q?cWbUsERv4E6Bcmm9xYNT/CcLT62c8fZhrX+nXleNl4DNFYNmODa6iPnNCMqw?= =?us-ascii?Q?jEKPpa8REDlzfU0ReCP1nTVH0gPG9Ef+8oncKrBu5YQYcyQxTR7bPM3wnYUW?= =?us-ascii?Q?PGgBGoJwA7ZU091eqqJ5lBKyzLtZwU4GV7aBYjvkCy+1eLi5Y+mthqP90ZfS?= =?us-ascii?Q?yoZ8dlq+XkzQ+V4/nCvtdrZzofHjhFU4c9F5NGAgct6hKzU4O0izSUsQ/hqT?= =?us-ascii?Q?Iwa9NxS01Q9j1i3BOzr7/TnmYREYw0V3T9qkZUHM7BG5AxZiVwqCd6Xp/kBZ?= =?us-ascii?Q?QkxZK0P+vvwH3hkUeoqkzqv6YQh/mMJkxPU33kVuRw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c85ea9a-020f-4f71-38bc-08dc83cbfc12 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 12:52:11.2114 (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: TYUPR06MB5978 Subject: [FFmpeg-devel] [PATCH 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 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 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) \ -- 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".