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 7864E46A38 for ; Mon, 29 Apr 2024 00:36:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F297D68D47D; Mon, 29 Apr 2024 03:36:07 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2048.outbound.protection.outlook.com [40.92.59.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA2C368D44E for ; Mon, 29 Apr 2024 03:36:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LqdRm8FiJgD+CIB6xszWGvjlnmufYzJ2T6qGYtaU+5bzg+DjXgJNTZ8tSJ7HOiMS5QkbCho8OoZwRoKoOEuo0DcM/CH6lvJg+xJYHJdwJeHZt/sr5bi/dIa4f920RVQcKH/BKCcKBIxP7k4J3sRqGWpqPMI0jrS1FDudHdC/LODb9WiDWT1UFw5+voU9iXxSmTca9bnwIGs81ftv+VSw3XhzKuStHv42dwwRmzOaSzcJRdsDTIbYVS/8qa8coINj7e0mjihUBVMqWdWSIXpGcuwD9WyQi1KHyquK0jJtC2/fopiMpdjcjk8ez9YnRifGMnvyQTa3VFUetp8DKfG0Dg== 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=nFvqYDiSQmB8x8bsWl8Nhp+kZ1WE7xqNfkm55vbEPeY=; b=GYgYJfiW1iMIoqNKfVE2juloVfBlbKldFKlwO0U0vBbBQ4u0jWUmZ7gKJJvfeuLH5FgrelLlh9lMgAqpFbAUBjIGfHpz/m0FERqc4V7vzu+C0XthG84UwV6TONdWfek96Ne/5FVwluygsCTqIpGUl7ARAkgc4ThrQx0UC34Hk49F4ZPd/G8t0ZnndrCKGBh5h2fQe2wnuAblUeJ8SXvLcbFaJ8rwogj3vyLUbCcoMqND/8VSyTudtGIsehReNEpPUrVkpAK0wh51waXkL+svMGDrQQTX0ensJSUQxNOQUh725AoXFnA9W+WwO/8eAQ/TFsMIQuoyYzTRv2dDdo49rA== 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=nFvqYDiSQmB8x8bsWl8Nhp+kZ1WE7xqNfkm55vbEPeY=; b=ERhaLWuKqEKa7LdKpvOmn1UjDaFWH2BHMsToCvx52PUzI3R5HQEVQO2imdd6gC1DXFH10Ph5Ja4aGLzqWujXUMvE2mUgexMfNg8y+nX0035Nrs7Q3fjxZpoQUbzZQrG8NcGdebvhlDAUSKLDzps/n3oIFtFW8WfEy/+Sy4wVm8TY4Jlwc2QRqx/EeAOqg4s22+EkTC9G+l1wbbas3DEjBcR4sTkHkhqVjULVhwCGUNuQ3eqTaiRcJPJ6IYBd0RzTHwrs/WA+iZ1i4sXhkpBDOWGWDFf/ZMS0dzUu55t1/15jYB59mvQTSgRZkkNtqIflSXpLkr8DpFz1Fm94LNYgyQ== Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) by PR3P250MB0068.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 00:35:54 +0000 Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd]) by GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd%4]) with mapi id 15.20.7519.021; Mon, 29 Apr 2024 00:35:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 02:35:30 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [7RFMwGTTQ4EKxsju2ETVGLzGtY/kv1SwZbGkXy9ZBOA=] X-ClientProxiedBy: FR2P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::13) To GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) X-Microsoft-Original-Message-ID: <20240429003535.1516058-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0021:EE_|PR3P250MB0068:EE_ X-MS-Office365-Filtering-Correlation-Id: aa8f4c0b-4a75-4d8f-de70-08dc67e45413 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: /XETykICP9+vhRW+KQDREgW0QNlRQd5cStlm6WuS42NzPshjIg6Y+YtmoL2oFxk5kTZ1W0Sw5GvrW0BLUnxs/pJ+Vz2WMCynyQlKEHqK3diL4PU5jcvmdJP36zRkMWLsp4zVC3X5Ci7en1LXN8zQ5XyXZ31rsEZoOG7Q3FA3yvlIAeVxdyrTrmsnAl3wLuMZMU5FoBHVh9ECAIrM9q/QEuONwycarUkDJ6PGOUKUc2x4MLdosEZ7cDnhiUe/AbrdGnVy1bybzNljQBTw4yiKwB+7fWZBVLNwQ8lwIG+PAJgEoZp3IaiIuBGCyTLbia6+hL0nsAYWIJnynoWAKnXXXSxMveu27hSonT2Wqst5T18ypaauXrFbdooEP6r8UsmkvZkvmLDBbrvwbl5i+9jAcFsTRDwpkcxce/+ucBkE2EQB3IsOUhourdMXRmSqtmZdf/dvtL6x6IMV6Kln4Uoiq0I9/51cYHQmUv/WuGHjlr4V8nMAh9LAim3/Aa4CsWfzkDaAwk7jA+B+9dypm6+WRYwNnbtv7wgoUbVnQkCenkTldJOOjW9Cg2nGDh7aymICpuu6y75eLTy8rbfR0HywLrw18rE1AkPi427jG6OMPtWTm9RK8jmsu7teO49dkY0h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cN3sEOcOm+pnR0qcHK1AUhPchBBFb79e3PdbkT6dR3JcG8LwiHCMZqMC3cmg?= =?us-ascii?Q?0nD1nKK2g+Yw0Y/he+eIkVjn0wYZlL/cRRL1z0Qkyd1V6YmBq0ObsoADEqoJ?= =?us-ascii?Q?lHErmNl9jQBYYvTkcIxQ1VQsN28D4k6tLujCTZN6p5O3KSiWHMqfu8MX7ylq?= =?us-ascii?Q?j8STNZVF0T7LYCjmFPNyaFvBqiWUUZdIuZr529L5iW43XJeDveM1vXU7P70g?= =?us-ascii?Q?gIOBdXnjSlQpuEPiTaPjUEgyGXbtwDLj2E5gg++Y6ZPEUM853fLihtbQHiJj?= =?us-ascii?Q?e3nkEpplXhjtnDoIOlX4MLHthchC8KKE+T5h2pYmOErzm9l9PppoQcShZ5MH?= =?us-ascii?Q?9CikI4jxRweMJZzXyerFmFo0ueqiNEQqBsfbe5QldnVW5U3sSBK0AcRe8rfe?= =?us-ascii?Q?IKRuxplfZ8L0zRAdhUA5h9Hijmy0Y7QfuVdYiQxfQQn5oKDD+EgRbZSxvz42?= =?us-ascii?Q?aMcb26kdLFLRTdVaQrI9fFSFdzbMKV2isZrK1sxReb/OQ/IYWwgWwT/qGnOK?= =?us-ascii?Q?6KZaImBQmp/0xDaJ9+VtVqyAVskdG12ZGS6xV7Uo+u3Fof8kSo29or4KZx/b?= =?us-ascii?Q?qQBhXleVEWX/4taEXzwjpoRr08nWD4ZqqlpWVByvETQN3ulrNSg7X7J2YDNr?= =?us-ascii?Q?mZyYK2zrH6aDoh1u2YBidVKFsRWDqVdMBUXZA5gDQ2tN/ryE8ydkbzZiYANu?= =?us-ascii?Q?bPJM47i3uig5uQw+YIG85xtcfZ/ikrzUvYjg1KBXs5Z4QDU5TJrcYqEJb2IB?= =?us-ascii?Q?MhUhZatvY+FgFEVNoDI8fJiDa9m6l+EaK+0C3lz7YSJZ0icWbh9gztv8PLfL?= =?us-ascii?Q?6YcgcDwoHVY/dhhQXtKHk/jocbna8sFPm9ssVhMw4YN5DKWFLjdAL/iESwH7?= =?us-ascii?Q?pl8bqPqQigYRI0DIrmHHZUXNKt79P3zTgwWVTBnvX5HoEIMryp5GlSpMYz3P?= =?us-ascii?Q?s5HzgWct/RnbOlF16d7SbwhgjnqpDjg0rRZKrQsDsNlCy6m/s+5QU+YmPiyV?= =?us-ascii?Q?6GLAMBTsMzFfPlOQDhWv/UnDqySLv4Z1hHNsYlW0afL+wxn8qesOJv2lHuoq?= =?us-ascii?Q?Nvq4PsI9uYDbrBzI+o5H6PlxByTXAcASBt0Rg1UM+Vr0cdoW+5RY98CvKj84?= =?us-ascii?Q?IMNrAwbSkbOjKRPNJi4irQGLK8qIdvCi5CCSUe8UMM06tEqxfTQI0Zth1BnU?= =?us-ascii?Q?H8rIvehv+ZwueMvWDmKwioRbjvrUwcTrEAMGimbuF/mb1VCdnxXzm5dmgP90?= =?us-ascii?Q?JOIgoEND29Zn01lnrd3SvNcPlByf6E1ly1Pt5cy5sw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa8f4c0b-4a75-4d8f-de70-08dc67e45413 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 00:35:54.2071 (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: PR3P250MB0068 Subject: [FFmpeg-devel] [PATCH 09/14] avcodec/mpegvideo_motion: Optimize check away 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: When !CONFIG_SMALL, we create separate functions for FMT_MPEG1 (i.e. for MPEG-1/2); given that there are only three possibilities for out_format (FMT_MPEG1, FMT_H263 and FMT_H261 -- MJPEG and SpeedHQ are both intra-only and do not have motion vectors at all, ergo they don't call this function), one can optimize MPEG-1/2-only code away in mpeg_motion_internal(). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_motion.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 5b72196395..ccda20c0f1 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -114,13 +114,16 @@ void mpeg_motion_internal(MpegEncContext *s, uvsrc_y = src_y >> 1; } // Even chroma mv's are full pel in H261 - } else if (!is_mpeg12 && s->out_format == FMT_H261) { + } else if (!CONFIG_SMALL && !is_mpeg12 || + CONFIG_SMALL && s->out_format == FMT_H261) { + av_assert2(s->out_format == FMT_H261); mx = motion_x / 4; my = motion_y / 4; uvdxy = 0; uvsrc_x = s->mb_x * 8 + mx; uvsrc_y = mb_y * 8 + my; } else { + av_assert2(s->out_format == FMT_MPEG1); if (s->chroma_y_shift) { mx = motion_x / 2; my = motion_y / 2; @@ -820,6 +823,9 @@ void ff_mpv_motion(MpegEncContext *s, op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) { + av_assert2(s->out_format == FMT_MPEG1 || + s->out_format == FMT_H263 || + s->out_format == FMT_H261); prefetch_motion(s, ref_picture, dir); #if !CONFIG_SMALL -- 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".