From patchwork Wed Mar 27 13:01:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 47529 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp604579pzb; Wed, 27 Mar 2024 06:02:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUi61L0dZf+8LmjcY74riBNhgJuMrycmCK82+YaLhZJDPoMmv19A00cfhuTVFsgQzCaGCqBJmpXA6lsGg/BGA96p9h/MnOzdpDLWQ== X-Google-Smtp-Source: AGHT+IHLR5h7SRi5bYVWonZKc3FVwSi3nBcpxU1bmb23qQjunZPQ5WF+F86J3u8CFLeJBMgw5zH9 X-Received: by 2002:a05:6512:60a:b0:513:c428:9daa with SMTP id b10-20020a056512060a00b00513c4289daamr7471209lfe.0.1711544572734; Wed, 27 Mar 2024 06:02:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z12-20020a05640235cc00b0056bf79cb9edsi4565494edc.454.2024.03.27.06.02.51; Wed, 27 Mar 2024 06:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=N4prwngk; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A57268D6C3; Wed, 27 Mar 2024 15:01:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2014.outbound.protection.outlook.com [40.92.53.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADFE968D6BA for ; Wed, 27 Mar 2024 15:01:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M+vQ83vE9UWr2Bs24gXYx6OlqtMs7K4Lfzbgm+ObYyAHMRbOuiokCFKP1zLBIO9ST3X+pXw9zB82FAbh3fvLImVSYek3mGs3uFPLRv+g11LFIbDxMK5q5IYmZESpSPIwtQHsaOZeGIV/EIEdLI4LNc9ig8vpF6DZhrX28K/6D71C+jH/VickW0JneGhiNGrCcmYXYFtmTBHsnJ10B8TWC8VnUblj8aBiE4+ux9q/b53IDuBwZJt7ZVgINlUkofC/lxSgPb1TJwXBpGAnG25ab2WZIFBA08b//Z5CGYVvhY+ZJJBMzjesVxq680qBIacAriS3+kMTTYSDia4fBarsgQ== 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=WBi9cD501AkcTUrFEtBUJxr+yO9W1a1BUZcsXPXWdaE=; b=e8eVd2pdKxB3jUI/ezBgiQOK1F7yn4dl3w/2S43eYom50/MJwJ0kEmjSNb7Di5pl9tZegJAPfDa4L6Dj8kzgi/AWYyALKMw9CZMsJl3frYzVMe3a4fGRwyLYZqpQM4/ag39HqtlM4iH6NSfPz6bj7++wvedJAbhioQ5AWgmo3NCN5quIHqRMMUyhnHpcY2QAgiV2SUgb2sEmD3rjO605hhUW863y5T7oCJ+/zwICEIuJyRhJTnaQzD3YxSXmxmBJyIq0zZm5C5o+vZObnXO1pKgsttrLiQ8Qnb8NDppOYJasXD7K9UVx3ZBAFiWuTKpR9Go6+FHqI+g/bMRGta5Vpw== 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=WBi9cD501AkcTUrFEtBUJxr+yO9W1a1BUZcsXPXWdaE=; b=N4prwngkLMakLZcmwlU585d3pqFV1INjTMeafsQCSRaqwB9rUeyhxuE2+sydrs1qfVpWo9D7jesedxA586zmlP/hNgkO5C1xXauYJGFkNbQHG6l13OmiYlGHbzqhevE5wl1KRCAypZmPeGvHevjmbsz/XP08s2OvTEq5fusGBIRFzfWqMxVFug1F4VH311+u/MvDsQxfXY7oh2j/Jjz5nAK+IbPz1wsi4IFpeCx0/5qS+l3vawfG4Gx+DL5apNrg84HJSozcYs+4/Q72ox3djWfNoVhO+puAZ07TjtT86bACdKe8R8I7EJkFiB9fD0QLTRr7+PtjBZp5/KzExbU0Eg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by JH0PR06MB7107.apcprd06.prod.outlook.com (2603:1096:990:9b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.33; Wed, 27 Mar 2024 13:01:25 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::d001:da90:518b:ec1c]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::d001:da90:518b:ec1c%3]) with mapi id 15.20.7409.031; Wed, 27 Mar 2024 13:01:25 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2024 21:01:03 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240327130112.6111-1-nuomi2021@gmail.com> References: <20240327130112.6111-1-nuomi2021@gmail.com> X-TMN: [w2Z2+BQtEUYZplW0+iaNTVy01Qcjn5yr] X-ClientProxiedBy: SG2PR01CA0117.apcprd01.prod.exchangelabs.com (2603:1096:4:40::21) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240327130112.6111-8-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|JH0PR06MB7107:EE_ X-MS-Office365-Filtering-Correlation-Id: 104fa0ba-b615-45cd-aeca-08dc4e5e021c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wGQ4hJbxGOuBXPpI4SOz7LOh1to56MtikdjaRSS2Tyg+ZisujIRl9DGTVgS0Rs0L8fef43eZ/Zu3lynmUu7R6kagDg7M1ii6HiltxtT9BP7bsL9+tOY0++jeOfEnAiTclIH44NzkWgB3IgqOAd+BIMgbXaD1IBGqw3Xrw2cbaEPGGKo78TU1OjSx63DfkXUPoogH0H2Ic9zsLp6E7flbhtwUcnpK8+7z0oepO1aDx8VuP0IoHuDCSq6wdZ12iwgb02o2oOg3zGR9e48WJg7HJW5ZGsL5sHlanidfVfdakZ+skDvhaBCSSMMRWQ9jYpZNupQFZth5xab8C7Ym/jQQERC3y2bn7YoELTP6M7zVg7ORi8IW1ptGIxx3SiaozTQgctAVZ5l2FsmAWb48sIKRkNERNnHyYg70B1MeEdQKjWNYTOmvhh2pXTqArtbAnMCGAUiamKvKAfSKdVUOr4gS8VBmyC9RJ/iUavmblP/H39CFpOo9slovM1Byxm4UkH32/rhi/JZL+Ox5J6fqop57EEUZpsvJjH2Tv3ifknAurbxRJrETgimTIrXKy1GS/cg2goZTehchVV5xFoEjE1X92v3kbKu2bxjK3DaYmS1JgRxgQlxV4jcMstJPO85j+HuR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AGrNJce2jWcPdhkLksHaRfVt4gkxz6xSUM/XHLSToS9gFGEQtNvlzLOf3RUcmXaQep3rO4ovnPfMctXxOApZiUUX+vfbRROpbeLbU4+BXXb20906hf8j1S2vkk990vA5eaaYd+nn+YC+kr9xvUDxDMmZ4j1S3PpLjXhK8cB4IQfCDSpXp/IkxqaaBWH5vV2iDEnYkZvhvr6ScQPgiBvAPOn6LGyEzg9u4fBUp64h54VfwOtK8nwMbD/W/pC0pDnwmmzBzp8fu2hpitjNnLRWZVDK+JP0tCOFuF1MOc22vRkJtkbf+NqCp5esyPw4QTXPMvpvOHxoYqMgBrMbOkTawKHjn39yGk3pazkc0y6UHt+nVnSCYkyOrjSndBR0dJlP9EJHEywHxGWd0bLM/PMkY7XIMRjP57kI7+JIrxJnlD8A+nqg8NXAhacpwfXFV3Vuw7FsgucQTU4o6jF9Naf1qQ2M5ZA3A+aud62DBU2Q+IgNQDdFoaB2QANrlNOTdSJjC2FY6+5b/zRUXvG0+pLaSKrjv8RcTrdiRq90Bim8f41kdN3sirmt7WQ8JuC+G7ymZkYGXZR/e6wn+rrzSeDELFZ6C24/vuJJ9lwBbPJtouQozrYpyFUuP3M5RnD+KcQvpvQ1BXsn+YJo+xkkFkUUkmeJP+A/dENsbe0I2MR/IriS6UpYnZ+jtaFmY01a3GfWID1IBhuQ0iCrRLBv2Epc6d27F7kfweRDLVWiwpDz//yLgSsnJPjPHc42fHuYCUDRaF6T6tLM5gY79vkyH6iiO0iVvrz+2xPC+lZPxrBWKRTNIbeRarQRqvDo+c8ZtosbST+I15+cWfw2Me//5K0z4fuKupiBP3GTxn880Buy8VOzB383SewIIHMvsQ0zu1zzkHro2AoNYMzGfgCXgf9DtV4RMQoc7Xqo32ErO3xi5F6i0mW/0U1pu8GDQUn5maaf2qHaC/z0r2BmFMXtEUj1qIEFBSMkIE1MiHAHHUkateqT7+PzPaw7rE9tYN/HMda2awLs/L815zM5daK2jkvIqQ5d2jDXV+mmGMexkTmREtwrFFWepo2P1/ZBh48B9TWQ436/UuPmmiNPIElwT8euPSCXO7Qn8yiFgRWFWW/ZbghxayBmREhyAZtSR6u+W4WnxdRjJ/Gbx2deuVGXnMAXD94e1ezgb88OnSkfRIvINvkuYlwu3ubvt/Ft0ESs/DJbxGjwAui3Y02DKejxjsukCYoABA754/fJg4fauXnGxiQ2wNAj42tQERDkok5dtZk6/Yqw1A9lm554Xt3nWlUyTg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 104fa0ba-b615-45cd-aeca-08dc4e5e021c X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 13:01:25.0895 (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: JH0PR06MB7107 Subject: [FFmpeg-devel] [PATCH v2 07/16] avcodec/vvcdec: ff_vvc_decode_neighbour, support subpicture 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ystksAddpVgb --- libavcodec/vvc/vvc_ctu.c | 4 ++++ libavcodec/vvc/vvc_ctu.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/vvc_ctu.c b/libavcodec/vvc/vvc_ctu.c index e48ffda938..05c3e04b83 100644 --- a/libavcodec/vvc/vvc_ctu.c +++ b/libavcodec/vvc/vvc_ctu.c @@ -2493,6 +2493,10 @@ void ff_vvc_decode_neighbour(VVCLocalContext *lc, const int x_ctb, const int y_c lc->boundary_flags |= BOUNDARY_UPPER_TILE; if (ry > 0 && fc->tab.slice_idx[rs] != fc->tab.slice_idx[rs - fc->ps.pps->ctb_width]) lc->boundary_flags |= BOUNDARY_UPPER_SLICE; + if (fc->ps.sps->r->sps_subpic_ctu_top_left_x[lc->sc->sh.r->curr_subpic_idx] == rx) + lc->boundary_flags |= BOUNDARY_LEFT_SUBPIC; + if (fc->ps.sps->r->sps_subpic_ctu_top_left_y[lc->sc->sh.r->curr_subpic_idx] == ry) + lc->boundary_flags |= BOUNDARY_UPPER_SUBPIC; lc->ctb_left_flag = rx > 0 && !(lc->boundary_flags & BOUNDARY_LEFT_TILE); lc->ctb_up_flag = ry > 0 && !(lc->boundary_flags & BOUNDARY_UPPER_TILE) && !(lc->boundary_flags & BOUNDARY_UPPER_SLICE); lc->ctb_up_right_flag = lc->ctb_up_flag && (fc->ps.pps->ctb_to_col_bd[rx] == fc->ps.pps->ctb_to_col_bd[rx + 1]) && diff --git a/libavcodec/vvc/vvc_ctu.h b/libavcodec/vvc/vvc_ctu.h index 8020e184c5..460dbdba59 100644 --- a/libavcodec/vvc/vvc_ctu.h +++ b/libavcodec/vvc/vvc_ctu.h @@ -421,8 +421,10 @@ typedef struct VVCLocalContext { #define BOUNDARY_LEFT_SLICE (1 << 0) #define BOUNDARY_LEFT_TILE (1 << 1) -#define BOUNDARY_UPPER_SLICE (1 << 2) -#define BOUNDARY_UPPER_TILE (1 << 3) +#define BOUNDARY_LEFT_SUBPIC (1 << 2) +#define BOUNDARY_UPPER_SLICE (1 << 3) +#define BOUNDARY_UPPER_TILE (1 << 4) +#define BOUNDARY_UPPER_SUBPIC (1 << 5) /* properties of the boundary of the current CTB for the purposes * of the deblocking filter */ int boundary_flags;