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 7E4324A7E0 for ; Sat, 11 May 2024 20:55:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0589768D6C0; Sat, 11 May 2024 23:53:33 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2091.outbound.protection.outlook.com [40.92.91.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5442068D6B2 for ; Sat, 11 May 2024 23:53:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y6Pf0rcV9mUCeCRFZi5qjYxnM2euKnwErURoIynoGdTohVRz1dbOQv7V51RzCvuSXmgK+120e+73ImvXHH5dPZ6w8V8Hz40WlORjy8eyLikQ8mIg54xvlaF5M+/+LwemvxompegVelo0Bs+eYEXGdYF1Eh6NYpRAs4sFQgyOxG6THBrNR5ilFI3J18pQJqUkM7GIaC6847qqFpq41JFew33QUx9EB++Xxv6IWEi9ceE39Xs9f6MENDNYSlSEiqowdgtHFRJ4sbqHHQ1q3COL80ES4WllGZd6bpkaRyRejnT3F1aUwpmNTqkzrM68HmxNgkz2VOUWfgYOFYtHtHzMIQ== 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=kprnqjeqTQYHR0d0SHGr8U3mOfH2tGNeOSi9Npv/AWw=; b=g0rU/p/gKdyArR4UAq97mndcZX+orJEIVAaIjpXoeSv1j8wk442np065YbcUS6srhijs6PC2IMBl0+UFzs7NY/d8c0HEGaEHwydHpyr35I6lO97ZupgSI+uhYTbNZ0HTZx0+aF1leJcVvOEN5JpIWuJ9A3/Ni/ODnMVnInxAZPDDPypgdxnUbkpAyKEl2Q4qiwe4JLI10sXeP9mHhqa4QyE5Nmqp3jvo+nQpjCqcGqbxKV2wkP+gnu5zLh+uPFq47kSUhMK/DspQHlucN0uTueeO1W6A3sfvjrDDD51zXYT6P02ClK3DALcBx+nUhsBplq8LxpsmUK5sCZ8B+0b9Eg== 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=kprnqjeqTQYHR0d0SHGr8U3mOfH2tGNeOSi9Npv/AWw=; b=PgcyR1g6vBg5vg1OBqDMJU8EJFfde+b9KP/SP2MigPoZ+aRFS3yF2+zVwvidVVOZVR6VX2rV36a8aOpxUugwS4owOVGkkIACeEGnOiXe58OE/og/8jBbCItDK4OXKlx9Oa9RR2C6t0DsnLZTe3KgnSgbaky1y0GYXietMzWWA5iLu1jXEqNC8XOog0Ag+LSmNIWIIZZNNoFnIqrwkinDQPCSX3ZtOtK/pohpVZzJxxApPReK7m2hvXxOp0XLOJ3VVjF22iuiO7WaFSG8ZoIsZeahWQk3R8cCp0NlMa2FnoYkMmUiSu+JNAL/gIywOu03AtA+e9P2N9vT21vUviWqBQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0370.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:53:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:53:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:53 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [4kg+N5qcC87T0EWkf+A8NhqckEHTdqgSatLGJOUuYgQ=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-28-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0370:EE_ X-MS-Office365-Filtering-Correlation-Id: 96c83c31-fe69-4aeb-96ff-08dc71fc674c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: raDFJN1UZQbPMUOAmHbD+zW/XeDCFczPj+WR50ysnidf88Oz7m/e3C2Lmy35jjplwNEtBP3VQHMIFP05De80YdWy5L/CZY1DGsSqH3m+sGSEIghgKJCBKs0PWxRU6JGonll0SKaRBFzmuxuX3hwM68EVvDPE0vXA6gRqCGbHkopgkZsbUHx1ox8f970Ocw7uJG/zpUZY0tRvC++YxUVbNHOrXRWj3mMfK2B69IBM0+EOYz5GhAFUc1PnZvxp4UMycKsWG/KrlsKJjF+UzmVZw/wsapi8h5veizDf7pQutcgOsP1yiJMGichDkQeWKrhzZlPIPOozbMMi5oBmU2KfHH5V0dbrkiHZxNBcSMGtqELKQnbitZoPRcOoWycZWg/x6fNV6/tVHgCMdYBOUBh7q6kVaBgG3J48HiwYKW84y/XbvVH+Jm8fkcWIuoNW7g/+Xt4WN/p4RuLlKvZwkQzmGPr9IY68yUrDxPsjASRqSrBmEDW4XV8bub8DXrIgKcrLD0MKxm6wzfXoqo8YhCuKex983lgQlVyKbrUhKVLiErT+SKfg0Vikm6TO8s793XX55mBw5sJrMBDvF+ET7/EiU7lZIzLLbqI2d/OLLlUz/y7JFj+u1z7Y70j6nK+5+iy5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aDM06dYVuhGpCn3xBJ/Q1e8NfRB5bzWAR+FFBg6LQI1MJEt8LDJSVRS3yvwq?= =?us-ascii?Q?gs+MxhT621Vafe8jV3BI3oc5Vgyj6kX2QO8meBfKZd8vGkX9x1LRLzB3PzVq?= =?us-ascii?Q?Y5XdulBwB0Ot2mtEQPHcmFmCn6o2hj5yFe1c63rH9PxeyKEVJeoHx0htnLoo?= =?us-ascii?Q?sAyMM0aHGjvpyfYx6tBbIfinxM2VKzFQfEfVNSm4aC2ZI1FJzdi8sA2Bn/5d?= =?us-ascii?Q?fPU9j4AWiDKMP322aYEm2qLfEUw1fCjIvUpui6y1028TqSq9OkKoAg9e3jpT?= =?us-ascii?Q?jpi3ABF0RjJXYa/IPXk/Q6JHkzlk0mC0xoTTKu4Dm+Oiyi7RElSCXRJuwVEZ?= =?us-ascii?Q?2/lexZZblVh1QRAvoE4xNZ3eONepQlt8aeoNvOmqOY7zEczUYZjIjaDpAuTA?= =?us-ascii?Q?26Mo3zb0GYdKi03gTVxaPKOzfwZtesSoWtsTP+8owjUVHhlj5deXjW7OBqhD?= =?us-ascii?Q?p0OdADCcy0hfH0xL7Cx4f4O1JV2KYk2Zrae4NNWidS9gtH3M4iz5ZkIOHrjp?= =?us-ascii?Q?qu4iRw7jcMgz3338lmEFt1M14t/aGu+B85zjY8legD/p/+qZBscW0X3l0lqG?= =?us-ascii?Q?9LyUoHBPZxN18AXjL8CMNY921bzr6/JwvbR5PWBbwuEIj2M0T9wEsmVTou1U?= =?us-ascii?Q?f1SofANLFM3RJ+GAvhtrP8E30LTDTNTaAlhN617MJI/3+mvQ+NAfckYNYEsq?= =?us-ascii?Q?a1XNMKwfPIxWGk0kXGt3K8dauzPTgr50WYMr69xMvPV6pZ/Al0fvnN4wsn5R?= =?us-ascii?Q?y+9Qg6tZQA3kEm8oWJhJnzO8nACWI50LNilp7fxkzz9hi18PMcTgFXbv6hqn?= =?us-ascii?Q?+LPYYeQ/gJCkvRs4eA3O+72+q9BEqKq57MOM1KT8gf2F3XN4X/nzaj6jvwbA?= =?us-ascii?Q?b9ocmmbfqLsGfszXNoSCVPER2vKs3klyRH8ZnE7zMe1Mp/pgghq/bPJG991d?= =?us-ascii?Q?1w09B6GE7R8iY4s2jYWqT+wHu6Qg/8EUJ8aiBydn3cfqt+hFZfYjE0G0LZpk?= =?us-ascii?Q?3TVE2W825mM5d8O+AGCC4wkT0X40hr4DuJ0XAZu0EAT+8+jsUy1+HCVCQkm1?= =?us-ascii?Q?E42sgMN7ugjVfqYiLLd1OSKO+JZ22rQgtMftgQZD9ESlABMlvltOdEBRrsid?= =?us-ascii?Q?8mzCOi8ZlfO9sy2sC06UcIe+KQUM9q75MN0NNMx5zsATPUw+9fkXxQH5iAJ8?= =?us-ascii?Q?9BCfoPLrCq0a0iIIL1hNq3+4DyheEQ0ysEafrc/IjDYfSOXo6hWia8KMsGw0?= =?us-ascii?Q?oieFI0oM95IE/GCo7iZJVXXcoVOg8wyWrlnEF76ODw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96c83c31-fe69-4aeb-96ff-08dc71fc674c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:53:26.1027 (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: PR3P250MB0370 Subject: [FFmpeg-devel] [PATCH v2 29/71] avcodec/h263: Move setting mbskip_table to decoder/encoders 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: Andreas Rheinhardt 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: This removes a branch from H.263 based decoders. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263.c | 3 --- libavcodec/ituh263enc.c | 3 +++ libavcodec/mpeg4videodec.c | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index b4cf5ee0de..9849f651cb 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -56,9 +56,6 @@ void ff_h263_update_motion_val(MpegEncContext * s){ const int wrap = s->b8_stride; const int xy = s->block_index[0]; - if (s->current_picture.mbskip_table) - s->current_picture.mbskip_table[mb_xy] = s->mb_skipped; - if(s->mv_type != MV_TYPE_8X8){ int motion_x, motion_y; if (s->mb_intra) { diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 87689e5f5b..e27bd258d7 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -692,6 +692,9 @@ void ff_h263_update_mb(MpegEncContext *s) { const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; + if (s->current_picture.mbskip_table) + s->current_picture.mbskip_table[mb_xy] = s->mb_skipped; + if (s->mv_type == MV_TYPE_8X8) s->current_picture.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_8x8; else if(s->mb_intra) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 6a7a37e817..482bc48f89 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1592,9 +1592,11 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s, int16_t block[6][64]) && ctx->vol_sprite_usage == GMC_SPRITE) { s->mcsel = 1; s->mb_skipped = 0; + s->current_picture.mbskip_table[xy] = 0; } else { s->mcsel = 0; s->mb_skipped = 1; + s->current_picture.mbskip_table[xy] = 1; } } else if (s->mb_intra) { s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]); @@ -1676,6 +1678,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) s->mcsel = 1; s->mv[0][0][0] = get_amv(ctx, 0); s->mv[0][0][1] = get_amv(ctx, 1); + s->current_picture.mbskip_table[xy] = 0; s->mb_skipped = 0; } else { s->current_picture.mb_type[xy] = MB_TYPE_SKIP | @@ -1684,6 +1687,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) s->mcsel = 0; s->mv[0][0][0] = 0; s->mv[0][0][1] = 0; + s->current_picture.mbskip_table[xy] = 1; s->mb_skipped = 1; } goto end; -- 2.40.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".