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 2DD634A7F3 for ; Sat, 11 May 2024 20:53:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E914668D582; Sat, 11 May 2024 23:52:43 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2088.outbound.protection.outlook.com [40.92.74.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB07768D56E for ; Sat, 11 May 2024 23:52:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WBM5Jo6rYzPJKnUFxaxabLNWF8K1vjyAsbPxy84197rAgRQ8RMD3rAwCN+aBJ/MDgzN8k4CHWt4sioU2JUWdkXiMj8j/7dvIpNaHzmLM5DmyiH+VGOMHj2Iu0w3qFbfk1fYGFVXAk3+OrGqhMtYOGAUqKZ2jSluXIEOpeKgGzrhPsNhXPT7Ope39aaWTRJdya7rxgHeRoazCew4zQf3UeIJuKaZrpbch7Yg8Ge9q4C6cKKivSLaYqAGWDo9B236TKuUgPBMgVqYcRkACFhRTTyT0/BaABjJcobgb2iC94Eyeg+BsRoX3lb1mD4ePWWvWldUMTlUDOgzFQEk3IZP1cw== 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=N25/mNup2RmNQsZMvcyvrlMG50JuJFXCoAxJP019QCxH/7PN4bKdhTR9WCpIAAFjKkvkv54q6ux35Il7E/wZzMytTqYMODDq0z9EEaV7kTIJTBRh26/JeE7qiIHvRyAHQr1hlrzSrMhyWxzxs0ocPSRiOXyP/xDk6hwcA28LPqakGCPBB4ZwLtnhn/BITJ4+fQ5IVV+UnTgFJOc5w9qLZ1hCoKcdsmdT6Zz7I+3gvlPygAQL8XlBwVC5C2zC1CMtiX7In16RfSunWqpuDljISyBiymGyuR3SzxG6gwmucQwHcxMY0vsSPA9W+z2/Q8dk31WIBS6N3zpEwTOEP3IyYg== 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=rM7+aymqJilHXhtCj2fYnFltv/FmLOesaOjXwSpEX8UFzejK86Y362Uu43miLk9VB+XJ+TaKP4GKxfmtLPkyO8V6cWQtEYucizwCoTc/fsw+n/JGwRIMCGKJufULkSH5+TRavl5bRMedmmNlR2N3OROjz9WhRSWD35MJv579fwiBGfrWn0o2aqowBexxQ2MiiWaau9mfwJbqO/Rsfe6VvuJAbJPTC+9z0UIvFy9dl3fU4Zsqk83zWIcNSsoBuT6/wcqTIC9HvSOI14bTgOOnCIKQjfNxEbEDlaOtF/nJfnpvMUo4OeKOOnE1Fi7nycFbiPhu6fQ3pzvTxmuxYqTi/Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0449.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:325::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.51; Sat, 11 May 2024 20:52:39 +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:52:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:38 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [zTjKDMeU5wBTod9/MlVLVpmB5WY1kI1Id2wmhzZclO0=] 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-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0449:EE_ X-MS-Office365-Filtering-Correlation-Id: d9b739ca-6743-459a-5004-08dc71fc4ba8 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: ej2xoiRDkh807ntx60vsyMpGGBu8WDU8Wmx4SfpfA150IwAZmZRYTcVSTRYiTlavlQR6yMyB+sdn3DkMrGC4LbYFr6uNHhG0l1lf/1gDHW4kqLoP9wLeYULOGWIDlBZW8sdskZFtVr1BbFaUficehsC8PNPuJuSOGl+Kyr6yy0973rpdxG4BK4pWGJcepxaNPmLiY2qv0ti+cL1WUmVy3sEXkuFduACvgOIkgvFS2r4eMu2E/HEI1lMNyP8DaFvdTl3T420qfHTMkKnm1szR35nsyZtkEfSFWMi290moA9czHewXityBptaAqS1vMsvJVgh4U+v506ZnFzN57ZRqk/X4FOw2B9TG2L8cigVJhg2/4evxVhlQ5m9YK4Gz88SYxVwS3IvTRYFYbBX1C5k5gaaPwvhVPs0doo48g1AzHZkgMuVopupB2lPzqzCQzx80yfm6kzHbFywyJ+lqdpWt6+PoxKN5hkEnKzEdHRKnVZQyIEgBynci9JMjJPNOSiYaiIHZBxU5nDCLcKVWIY7yZuTCy4jmkBUxV7b/aMKO5AFWd3rXPS4hs1yfKUcZG2LMrUKgxzKomAwmvUopaOeM5JaGFVzAq8VwT167NIUZHJmDPQzJafdE0Me1Dp4X9iZ2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UibdGCVu7wjyjXwGWX0yiD3RdA0QK51I8c1XvC/FhO+E2LkjRT8qVL2esJvW?= =?us-ascii?Q?jD/Ajgg1UcouY64iXSNr8A7lUBSVOjHfWJbSpLygrvJSMowiUb2XqSHRRRRR?= =?us-ascii?Q?o9nhyiCVO8asZZE+brxlNTDxRfzn6GebBkA0j6w5PxMZ0X/Js5MHf7lRQldX?= =?us-ascii?Q?CIBLosMfYOk/YW3pwnpnXOUHQ1x/SDG6Q3qwt/SFUX9pbfTblwVZZ0QaFUDk?= =?us-ascii?Q?+MnkKzl4L52eqy+kCaZy26kZBJg8RumWndcp410MmpLfamQXtXoD5Nc4jh8F?= =?us-ascii?Q?nRsQegMoA0cRM8y1Ew3Lu18QV93g3frSU+49OzSTm+1jEGUPXnsnykPNZFb2?= =?us-ascii?Q?+OOB4QF63QHX4nTe3E4bYP1Nh+MHWSlnU6SMuz2n2gVAzv6UArj2hhcoGCT2?= =?us-ascii?Q?cJttfOQO8qB0frhDDz8sWex2blbssBsmTsgmzpTkMOftg2QoQ2yh8tuxbVnW?= =?us-ascii?Q?RGaMh1Im1cHyyNZmR6UikDiJF0ez3EMc9p3O/9iehsT3/VIGQbjuzpuWLdj9?= =?us-ascii?Q?K3e6HzItWrA+zOA+3kT4keEZ4puWyz2F+zNRfeHwZtAP+sjHTGbKG6i6TqHe?= =?us-ascii?Q?AyLEqdXAV9PfvpbUQuqlZWVzL+4EzqV/E716Ukg+wNw3khZtPutgHP10+09A?= =?us-ascii?Q?3SQoDsLVdbLlw2gGhu/uXMNTvnZhdojQiz+Qij3Ni7ReYKiCAGPgnB3TrcOc?= =?us-ascii?Q?pLzUkr8VRCmu+Pvw3tCtWyArp0ti6Wlxu28XblbhVbYSBdL3N9lcnxv0jqoV?= =?us-ascii?Q?USdfdcV9NmQNZTnvlzvVuKG56zVyenjb+Hn4zTvPxCdDt8iLD0eWlL6Ibive?= =?us-ascii?Q?gTtWpFIrZIVjx+MFBLtdX0NpJ5yhpKuZsSEglN9P4VqDB4paiVSwxPusAQF1?= =?us-ascii?Q?Wq+o7YtlrsH7nvfu0MSkBxOArSC0HU11j5aHeEJGQKvDSPbV7wCOeuaZiy69?= =?us-ascii?Q?Wvef4IlliKHLR24omlbIdcQcpLnf15qeOnvIAWnk+43lXKyoHu+B6RjeV9Ld?= =?us-ascii?Q?BRGSolfX6SCD9HjhwrMI2LQPCI/2vsnvAnUCPGF4+thBx1+sSshqjoz1Hezu?= =?us-ascii?Q?zhbAMn56ZD+XUMvT9LgVJqB5nnYQ18YyyKIsmCWxL/dO2wlteIoGn4wW8PPA?= =?us-ascii?Q?imz644kyREm/e+aJ5rjN8W0JymAHP0nQpXeNz4bT/aN6GDsCUM0vhs2fskeu?= =?us-ascii?Q?qogE28Bzvxvinp6UCtPF2pIB8DF+2PcHapdY2EDFpA/At33oTZjhWDJs/D0m?= =?us-ascii?Q?qc661Wb7Rqlca0jCaOVuUtFpJ6ByynbA7VcrcoHRlg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9b739ca-6743-459a-5004-08dc71fc4ba8 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:52:39.7285 (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: DB9P250MB0449 Subject: [FFmpeg-devel] [PATCH v2 14/71] 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".