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 935014A833 for ; Sat, 11 May 2024 21:02:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDD2168D86E; Sat, 11 May 2024 23:56:44 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2044.outbound.protection.outlook.com [40.92.89.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B6B768D869 for ; Sat, 11 May 2024 23:56:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L+JvhRH2O+NVv7QvfV4bQYnnjWMUhxbwNonqzjxrrMhe7Dbx9g0274JzL/xifSXLABZpy0S77g8n3YK0oWV+4mwSLiC4BYBIp0a6ZSd3xu/N5l3LTSUv6L9RoKsvte2jQWIVQJwdmA07aiiTAqV8dWl+whMjHebSzpLrM3AYfYWpJ6x7HqF5ILwp/qO54R++nXKWlCRYZuNEljpyPeG/vPOX+XXoEIjthKynWRw/Z7EuESkSEjMMhvK0LNv04gtg0daxUepjcyWgtiI0L6a1qpTXY9z1wzTj8pzKWU6VIIE9QaA0b3yXt49Oq7e1PQybwADkG6t01uC1AmadvCISrg== 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=8eIvKs6wV9Ghn2lrwytod+snnNPoYK4usjZYQLDOIzU=; b=DDpGMGOYazSDICm1R278m6w9bo4KtYihIR3gUkALNu1zWq76Kht3nw6Hrkiz2p7LvGUOKapOsBYeBtT0t4eNNwa1dFFs4hVYw0KqSVJ/4pHHW3bykH+EjT0D+vLt6eUHM9Gk1iQydSiP0+Yw4wQ9OaDWc0ECOgGi8nr63K/h/NrT50VgBHe2fGO7/wYoVa0Wc1mijSjhrjGLxfWwa9mYBjl9498JV7TnxkpB0o9pRcgNrXyHg4fvXQIOB1WfUfANh0tln/MZ0DC6g0dyt+EZxcsYts0nVVTeUq5wQT549hofZnODQapcJtJibiqV1H+m+yxveXAFI7OXAoArcbwDPA== 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=8eIvKs6wV9Ghn2lrwytod+snnNPoYK4usjZYQLDOIzU=; b=Wx9F70rvbvju8LIKZI++tdlj9sgDT1wmkYLlgFdf9i9HUL5B2EG3rJRiTUBVy8aMjvGgmFQnX6/TV/FACu1LK74r/W8iB0rWEmgz3kX/NiJEUUeaFkGV6+afFzQdLz9xrJ2MhkiwhCexzLfTKYhSL6LFStSaiQVT27Ejc75OfrtSkHU+lqQomRw8lXt5XDtcTI6OqNqgFYi4YTTuGG/F7LILBxNgPtu5NYRo/7b5xwxs5tSzIxnVJmYj3d0rtz7gmJCJvSRFlm9CWvD7LI1qeH92U9vOKuh808W7IgzCfw9QtjC0rv0WJZzceJszSE+q1ho5HilsjG2E/5qK0ciQpQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0074.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::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:56:42 +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:56:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:35 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [CiEiXoTcipSc5/4srZnhtwjo9eDMCAvRtHLF2DKPA5M=] 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-70-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0074:EE_ X-MS-Office365-Filtering-Correlation-Id: 521d649d-c68b-403e-a937-08dc71fcdc3b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: NKkBzoo82umpixrBbSyW3JKsMF2+o+oeP7MrB/ZJDz2cReRoo6Ld2tx3bzWjESuhg+ypWMbeDKa8ljCpeKt+K+BaD+NKJG9WGfqmbCNgULkU9qjCTPzGhTfhKMFmt01vy/cVn3SoHMFW9DrcDJUKQ7mpFGLl78V5quWrWy9hGUbULX3033LrvybUPPxBKNgLQR9LHNGk0xTZgHMoAy6bg+KnwB1YneHrcfBB3AMn1ZHcpSrwiyor9g73e55KVfn3mBjWYomf9GEfyX/rIG04tyZa4CeqXLmhBrES17TY7S8p+nfPj23lG4qMdtfYmbJqgGDx9M9khGxle1E75sO8ncQfkOnfMUu2duVuWBUcBeed7HLjyTFoOfGediLMC8QDigzmv+h9VDiPt4sRRaLDZ2z7nh4TBdOkYipa8bDrBbK+ceShIGH5lDeVUWcuFf5XE42aa7c9EcjBMJmfLoDIVFCQs/X82rYfOUtmyBFr1jQ/yVZ8++Od9Uzr4jm3L4L9XDpGsO99BMLnZtCvPeoF5RGluIcRR1+4fFHzblGoLmEHDqCh3P4OtcPHxnWMqg0lDUubbi/EhUketOWApb80bCFQQoeC0no5gmg94RdpmajHCzL0JbVfy2k4KnyYAGw0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Myo+e0yfSLWVYGJO71Xk6gGs+wWhWkgRIS8MMxmr4Ywv8MVTh/nw52/Q+xFw?= =?us-ascii?Q?xfc2coqcf2unzo4ZaIQN0FtRXiBAtx2xrVhZyg+MZ4tM14bUrrXV8C05/44v?= =?us-ascii?Q?nwM2PmxOuRV63aNcouz5bWZtRj7fbUufOZ80yt/lqH9+qV3A7N/QOEcuRuAU?= =?us-ascii?Q?QSlFDofoxjODkxQVWDIesuHZ8ipUmZCPAprcF+N9uIGn/rAakDb0i5BFBSy4?= =?us-ascii?Q?pI4/iuJjYz6X1mV7+l9d9brj3dNfo7jNYbAExYOOk+eh3JwHIq29OrT+Lwtf?= =?us-ascii?Q?QNwnYCZK+ItD4ie0U6Hu+s9WgTHkETjZRU5bqk+l/F7NTNYPzrZOHvDrQxQq?= =?us-ascii?Q?7Lrg+5raIRbRPWvQsddDwXQvWPpi6Twc+YtlVSbmdTPjfegbaUSr0P+HE9sS?= =?us-ascii?Q?L4ovLdlzGCFkJBQD2FDHZ3WdVJsC9sRnrxrIbBFeLn6GpvisHjTRqUUZV8fM?= =?us-ascii?Q?r1FRmzsqTzuGyqqXl/cp69gmRRxr2EtdDEklS/2w1aEt0fwmUGbkdrezBf08?= =?us-ascii?Q?hOkeSYEXUodibGYNpqHrK2hl6SsS8W6I/KYINZUYhIYayK7a/Ddd0UUrIwo5?= =?us-ascii?Q?+sJmqCdwcX1wtSi6+bLAz4BDXOEv9g2KgiEp3jL28cCfyGGn9OoRFD37CK7l?= =?us-ascii?Q?gl004dNSZ5LD2O4wkFLuAj4ra1/EOAekwOw8KhQZdqBzxjjEzOCOyOkw9SVf?= =?us-ascii?Q?BAaSzXWq66yg0+9suzAYALr3XtoIhJ+3gHsRgmwfoEDj7PPS5J+RXdgMkQps?= =?us-ascii?Q?jdvruz/JQmmMwIRg1gY1RvoroEWJEfI0cnfitSqzFMBbSEL7pkv9hpKXUHLw?= =?us-ascii?Q?wSpTl07TaC92lfcBgwkcRMMHZTNcouWiWPmJ7b0l9SddpqFmi7OaRel+TCfk?= =?us-ascii?Q?RkcqGTihiXuSYaJafss5FVyd0TcNHMozTKx8v+K1vhQ94Bw3oLpGuz34HyJ6?= =?us-ascii?Q?6tkdVgI8qk6XrD9hHfeanQJ4HL99b88lJispZkeCN3g5BQ+tJ99GwS0ITeKY?= =?us-ascii?Q?MPnXlYx+h2fwEw5iUIOhCWH2gQHZwOM2FBwWJ7IQT1pidWc56dB0fm7UnU6e?= =?us-ascii?Q?YHYwpiRyiVbWHxtnylatplHMfuLKT12EFuKrU6gMcGQps3TPc01+M2Ho5Y7G?= =?us-ascii?Q?z+KJk2AaA2mpnpKUzaUPuKYI+Fjp1Ur+efEGv6ydoGedKOwo7r/+RvRU5nT5?= =?us-ascii?Q?5KcMtfDRUgGOXkkWc40A83i88nlTI4bDiG6LYjjWKKsYfzOSBUa+lhEJ0pvX?= =?us-ascii?Q?1ysVtBx0GHR6NkVAnTxj+gcEtEpMR2GfsH0b5BG+jg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 521d649d-c68b-403e-a937-08dc71fcdc3b 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:56:42.2798 (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: AM8P250MB0074 Subject: [FFmpeg-devel] [PATCH v2 71/71] avcodec/vc1_pred: Fix indentation 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: Forgotten after 41f974205317f6f40e72c9689374ab52d490dc6a. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1_pred.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index 6e260fa053..87d9b6d6dc 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -719,19 +719,19 @@ void ff_vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], s->cur_pic.motion_val[1][xy][1] = 0; return; } - if (direct && s->next_pic.ptr->field_picture) - av_log(s->avctx, AV_LOG_WARNING, "Mixed frame/field direct mode not supported\n"); - - s->mv[0][0][0] = scale_mv(s->next_pic.motion_val[1][xy][0], v->bfraction, 0, s->quarter_sample); - s->mv[0][0][1] = scale_mv(s->next_pic.motion_val[1][xy][1], v->bfraction, 0, s->quarter_sample); - s->mv[1][0][0] = scale_mv(s->next_pic.motion_val[1][xy][0], v->bfraction, 1, s->quarter_sample); - s->mv[1][0][1] = scale_mv(s->next_pic.motion_val[1][xy][1], v->bfraction, 1, s->quarter_sample); - - /* Pullback predicted motion vectors as specified in 8.4.5.4 */ - s->mv[0][0][0] = av_clip(s->mv[0][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6)); - s->mv[0][0][1] = av_clip(s->mv[0][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6)); - s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6)); - s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6)); + if (direct && s->next_pic.ptr->field_picture) + av_log(s->avctx, AV_LOG_WARNING, "Mixed frame/field direct mode not supported\n"); + + s->mv[0][0][0] = scale_mv(s->next_pic.motion_val[1][xy][0], v->bfraction, 0, s->quarter_sample); + s->mv[0][0][1] = scale_mv(s->next_pic.motion_val[1][xy][1], v->bfraction, 0, s->quarter_sample); + s->mv[1][0][0] = scale_mv(s->next_pic.motion_val[1][xy][0], v->bfraction, 1, s->quarter_sample); + s->mv[1][0][1] = scale_mv(s->next_pic.motion_val[1][xy][1], v->bfraction, 1, s->quarter_sample); + + /* Pullback predicted motion vectors as specified in 8.4.5.4 */ + s->mv[0][0][0] = av_clip(s->mv[0][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6)); + s->mv[0][0][1] = av_clip(s->mv[0][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6)); + s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6)); + s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6)); if (direct) { s->cur_pic.motion_val[0][xy][0] = s->mv[0][0][0]; s->cur_pic.motion_val[0][xy][1] = s->mv[0][0][1]; -- 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".