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 A9A964B025 for ; Sun, 28 Jul 2024 03:20:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4276968D7D2; Sun, 28 Jul 2024 06:19:27 +0300 (EEST) Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2107.outbound.protection.outlook.com [40.92.53.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9897368D799 for ; Sun, 28 Jul 2024 06:19:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pkBLMlI2W3a3lcI36sdeqPv09TOJd4RTYAu4fM+h3nB+724+O+2pJcrbs6iHuz07Khk6ItRF5jYiEWvqUSNwGijQmEAMW0LbPfhXGtyAv8LEgB80jm4Vmg1uTJgQFwoPpgr6QMh9E7jP8+zk/9ntglAdYh2nrBQP0k9Fj8guikojFcA63MVXwGT0TInpAYa5gB4pfyVZ6vK/0Febd9xfAap+001TyI/uEypapC+bVVWOjksNNBbpK1k8TqnWg0Lopzi+Bs6uoGdb3o6da5OVEuvo5r3EnUpR1JmJGdcag1zzhfYiy1LskNxZ6AZLHo+O1P69CeZyGcR2Z8yVy74Zdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=OsMshmjJ4Xj2/Lrfrc/xCn5bJ6V/PeSEK5OQ8AuvKRg=; b=ZDDpxGUA/4MLbJlYxmd6tLHqMNEH2tflvhvmDn6kMFHsEyyde6gYPGwG112QDP5UeIq7DBGHYyPDM6UbDLBDY4lFF0oVh6upaktCV5OFt3ji8+RA/lYuylxXVhS/0PJlwYU9fbYI3FAhg+l1Q9cpnqAcXkrGVsN2BuEv2cUbyZKy//A1QXEnuxoGhFyiLjqjB1e1p/FwDm6FY+bO96KXi1JiTeZxKwFH4Ubm0SFZVQC2YkvSFiB5Kb2QwEZHNfGxRnb9gIAgZBo/hRzlt576WfBZWO4GfhwAguDvqNBpT1h7ugdgc9oCR8xIRKiisMZ8GDvhg/lQtO8n/Djtw0I+ug== 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=OsMshmjJ4Xj2/Lrfrc/xCn5bJ6V/PeSEK5OQ8AuvKRg=; b=W/sLzvl7ixobmBMz9YXqp5arG8ZE4uC8h2wQ2q/65taevK9c0s4fVA1QMRtWlJon7w8X32N8cVMA9w+4Uy6R/Futycn/wFWcTiVEGI6jDXg/ChFqYVTr1h+zA0b6jImui9Jr5skqPaUd7xISyfDQY/129s57j3IFIYJa7deeDExQ48GV5XZdY1IAJMGIlDvmu9P4+3bILxOC1FhXyDUI93nGk+Bg95axgXXu0+N3qFkujgNKgnN15KYxKvi+kI1igpcpytxvNkZSSgwyP4EFP+Jy0jtREZKEzpL/ztDBqAXs/rqu/YahE5Fbbdq+BcVa0AoKOwTc+QSRfWRRYey7FA== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by PUZPR06MB5747.apcprd06.prod.outlook.com (2603:1096:301:f4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.28; Sun, 28 Jul 2024 03:19:09 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%3]) with mapi id 15.20.7784.020; Sun, 28 Jul 2024 03:19:09 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 11:18:05 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240728031807.462810-1-nuomi2021@gmail.com> References: <20240728031807.462810-1-nuomi2021@gmail.com> X-TMN: [xNIKVGy2ZOgS0tO2sYsmTi6XlJ2IkrHc] X-ClientProxiedBy: SI1PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:1f4::17) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240728031807.462810-9-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|PUZPR06MB5747:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a869626-382e-4450-87e4-08dcaeb40b94 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599006|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: OjpWIetsGL1uOclTc6VQqxCgnqX4YeDgfP3PZjo59VUUJi/TrZjiq4raDIrs0l5WHRX4Xu7UcsELVivimnhzxyD6i2iCjzxfgvQwMatgcF4tPzfYsALO0IFsLEz6aOgyacryHnmOBeg96Yru90+waEBsM3/uk+BQC9QfwY5UDcuoNjLTjZaSLmeuUuH8ah/hRYkEVmsOHYlhxU7m1HIQfOg0nkgmjTg6X8BtMuYhCv/DymvrYiIuV/Sp6n3KEQbSfWMHe3IHJXTdj65UEEtz5jCOlTiKdxAuuvjGhK74NdkO+JnNXgjUD4e3qP3WCt3AXIRiu8yb8MnUnVAi6nWqVyXqMOJVDK9mzFmT1jyuH7FJ4pryd+pxwJdBU0a8et1cNlzd/MQHUTY9XbGUgL99p6kJj4ZNh9e0elKm8mwaT5JwNawEJ71ujcvXnJoPXv2SBqaAOOxhs7ZIaZY1BygHG3bLUtlaqS+GgP/59NKGG5AyZcyCv1aRWWy+3HGKPwuT+8sp5I6fZl1ZhZrPUd08DjGSGOAYSGhuzFpcoz872gb1s+DbzsWZn6WMYWLnDxYLSFJwNh8kXEYKXQ+nD0UhQgvJULIZJqP6EOUPwVXDqPkNdodMrpP44s1Y+dox/aLkYUJvNsFolg2sB6JIP6HGuDOJjklk3MomMyt71juQGaUtTIr/N3/6PwBWTp+OI6BdNYyszoq4h8KiIbqUNOgLnw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qrTrOmJehBfecUmEAKwNaORz2I9YM1PH+fNSeQ152nzwZKkFfMTEmniZlrGR?= =?us-ascii?Q?tLb/Ql8Zc7BaE6KPu3JpyYrosffWy+WlpOxpORKEG/NoT5uZ0BwzkXNQkmBL?= =?us-ascii?Q?48ydHOn+AGekgIkWqiIgAfQUxlpRF2sTKRzsEmk2SOarYmIzlFdqvoSp8fZH?= =?us-ascii?Q?xqdRkp4u1EGm/p9AIdQcTyZ48e6vz1AKuCRoLMZcBtB5WH5Vxi/Fnc38poul?= =?us-ascii?Q?FV0wztE0xcjDZrqdg56SIzDDTshTFd+OhHbpgriBdDWSHgMFAHfZcOCw+fTA?= =?us-ascii?Q?T+5XwI48OgyDtbCbw1yBtP71fUmyVNP0Gkm6//4vK/FoINlGn3XvS8StvNXG?= =?us-ascii?Q?wAMNwr3enfnA3fvhUVXT0ar2+N3hui4TjtZV5bt6GhuLV4qfQY+qSkSYs7JY?= =?us-ascii?Q?0bD12KhA4xkGW+lpPA5ERDDk/l3bgZpAS91FpB4yLZ0phreGYz2Mu1fqnyBf?= =?us-ascii?Q?zOcBO4AJcc0kH2FPSn0xdYD4ykYbfAjhkFElo3wTpjfGS3azJ6O4Llanr9VB?= =?us-ascii?Q?46hXxTGUGZ/nROA0SCekN/yDvx1p5HRlg8WkdlN74TVC1d+GEuw54DIubXqo?= =?us-ascii?Q?yqYYMPdZEJEcI67SceTaO1cSlMdFi/hHjq5OL8m/vCBubRHQMj8sXLoP8mPT?= =?us-ascii?Q?OVFxTVhi7V4xJ/GH8RgvkmOWWJpbrqUlD1KuCWvkfsk+pWCK+MjPUADZ5f2/?= =?us-ascii?Q?E3e399DVeCsNgryc/1nWrcx3+0UMXWKW3Z/fzACQeR2ZXRaq0hFegcoicfE2?= =?us-ascii?Q?ddJHU04LkVbyfQtaHfEF+8oKx03x0eJVjCLcm6RXR/qv4sJchtc37sD32us2?= =?us-ascii?Q?aHl0RUV1oxqokkVVNtC3CPFsjfrDFIPRUG69gmBXasd2CsdsTNWrukgT2Z+W?= =?us-ascii?Q?vEmvhJhRlwfU809Lt3PDbG7lAJ3I4F320wijLbsUESWjR3PsOEElln9a/1Tl?= =?us-ascii?Q?iLwnWd7u/woOQUivqOquuy7Se+Nd+2yUYQ1i9sLgIY1QvEv1G89deWKWYNwz?= =?us-ascii?Q?MCECqEfCllXL+OpV9T99/8zJZH5y7PMRBRDplMs5OqXXTbcV6HGlElcd2N8D?= =?us-ascii?Q?WV1jeIwq13H/OhyEV1APCIumSmEpXVhmqVtTjpiwZIUFsohc1oMTez7UhBGr?= =?us-ascii?Q?6pjfKuKj+z13XD50nRtzv+nPan/DZQXQQ+8YKjApFVX4xsSjz2WLo/wGVppb?= =?us-ascii?Q?jLiwWUuZ2Lq04PuKBTdygARkyey4KMfc+pH1sFPoAceggJZJFxlSD37nIU+v?= =?us-ascii?Q?8KIpDsGg4pCHNAd7ket8x/yHYbK+imHrtKK8j2ovig=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a869626-382e-4450-87e4-08dcaeb40b94 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2024 03:19:09.3127 (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: PUZPR06MB5747 Subject: [FFmpeg-devel] [PATCH 09/11] avcodec/vvcdec: do not zero frame msf mmi table 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/ctu.c | 8 +++++--- libavcodec/vvc/dec.c | 4 ++-- libavcodec/vvc/mvs.c | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index 579337759f..06b57215a4 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1234,9 +1234,12 @@ static CodingUnit* add_cu(VVCLocalContext *lc, const int x0, const int y0, static void set_cu_tabs(const VVCLocalContext *lc, const CodingUnit *cu) { - const VVCFrameContext *fc = lc->fc; - const TransformUnit *tu = cu->tus.head; + const VVCFrameContext *fc = lc->fc; + const PredictionUnit *pu = &cu->pu; + const TransformUnit *tu = cu->tus.head; + set_cb_tab(lc, fc->tab.mmi, pu->mi.motion_model_idc); + set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag); if (cu->tree_type != DUAL_TREE_CHROMA) set_cb_tab(lc, fc->tab.skip, cu->skip_flag); @@ -1325,7 +1328,6 @@ static void merge_data_subblock(VVCLocalContext *lc) PredictionUnit *pu = &cu->pu; int merge_subblock_idx = 0; - set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag); if (ph->max_num_subblock_merge_cand > 1) { merge_subblock_idx = ff_vvc_merge_subblock_idx(lc, ph->max_num_subblock_merge_cand); } diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index e078f9387b..c688f7d70d 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -155,9 +155,7 @@ static void min_pu_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); - TL_ADD(msf, pic_size_in_min_pu); TL_ADD(iaf, pic_size_in_min_pu); - TL_ADD(mmi, pic_size_in_min_pu); } static void min_pu_nz_tl_init(TabList *l, VVCFrameContext *fc) @@ -168,6 +166,8 @@ static void min_pu_nz_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 0, changed); + TL_ADD(msf, pic_size_in_min_pu); + TL_ADD(mmi, pic_size_in_min_pu); TL_ADD(mvf, pic_size_in_min_pu); } diff --git a/libavcodec/vvc/mvs.c b/libavcodec/vvc/mvs.c index e3f18f1861..86ad310035 100644 --- a/libavcodec/vvc/mvs.c +++ b/libavcodec/vvc/mvs.c @@ -399,7 +399,6 @@ static void store_cp_mv(const VVCLocalContext *lc, const MotionInfo *mi, const i const int offset = (y_cb * min_cb_width + x_cb) * MAX_CONTROL_POINTS; memcpy(&fc->tab.cp_mv[lx][offset], mi->mv[lx], sizeof(Mv) * num_cp_mv); - SAMPLE_CTB(fc->tab.mmi, x_cb, y_cb) = mi->motion_model_idc; } } } -- 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".