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 300F14AB2A for ; Wed, 12 Jun 2024 13:55:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61B2A68DA53; Wed, 12 Jun 2024 16:55:22 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2039.outbound.protection.outlook.com [40.92.90.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25F5968DA32 for ; Wed, 12 Jun 2024 16:55:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MbS/VHts6yVMj1yzLpEp2qT/YOvg2bphRtDpd3iKpsYRec9cFjR6D0r33eoy+JilhDCR7HdEM9uNURx7Uszq+O+WY2ESBjVeq4EpH5RAbIgxquShYdPhZmpX+YnIYmMTaU4n7c/LDaN5I+8R4kPU1KNr7TB/PDz3IlxqOuvvb54ONYPQ03UNCmX/4FERk0va/9klF8TTvE373GmczFQTLVd3U4UJKERxUf3etJlUke2fNcpDsfmL85QWwxfxcwbSyHS254vhhpT4BdSPwiUOn2qmunBLh4sTwYyACjETqI1N3EJ2r1fuHQy7CwnYpnAGA7eKD/amD3AFI9M5LEXzXw== 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=k74eW7e7mDDkiT6gqTmsjc7ogEUJ+frDyeG6NeHdhQo=; b=B0pP3KCEMpl12hioPN6GDOdNSJK65lSd9EMsZa242X+hCoIhkVm8XiKiev9dmu5yTb7jMeskZM748k6IK2p5iWzlFnzFxh9wxIj6UMTPUpvT3yDSI0UO4NfECyI0iA2+wl4TWaLXkyjqHjGJsjvhrPsFWW/y/nascBiqYpTWdKLEalrxewyM8iFPFqw6w0lv0lzmuqVvJ7zsV+xaC7AdX+73LAXjsb1Ad+alQpdXi8i5eg5K2WfQqVUKlnq9GKk9yle8x4iHLwgJM9AhKi79ehssdWzjwl/HhfEWCR+F7Pfs3fkPlmsjr4kcOY2On3SPvEHuwmBFDqRoniVpUDzeMw== 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=k74eW7e7mDDkiT6gqTmsjc7ogEUJ+frDyeG6NeHdhQo=; b=fHQ6d/9JlCUoxnUG5qJJH54aykL07se3MyIapuFPL552yrCLfDJ7us3XMajUgyQVLed8d8AwgbCvMPwcs2q0GZDivyqHKy3mHyU9FBXc9F2PUZLizgqinTybbcuN6Yeer0zAFEFtWYstXozFH/Ffc2VNgsqbtfzTdC0KBZ9tMXCk7kj33079epSYEBlLgvyYPhCyYBcGC2L64g5pJI9WnsisaooxYTbzVj6ZpS3i/ELT8G92cdPREf7/xw+IViDuIz3TB9xXuJDcisRqJYL/9aPjZyQjf9THL6eYT7t+EovnMabqwIHse9Sk5yJXAaBfFH+HySCaKMGSGPHTOYFK5w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0272.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.39; Wed, 12 Jun 2024 13:55:12 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:55:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:36 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [CxLUJSaPCPR+JrcNzrFjuAxfjlpOiIFN1w2iagbm9H0=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-39-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0272:EE_ X-MS-Office365-Filtering-Correlation-Id: ae24f4fe-939b-4a93-1c9a-08dc8ae747bf X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: 763D8YX7jzk+Y+lhgWS52r+UvYuuKzyK1+Xia3m+t7/SE8Q+O51fi8ccu2WKEx/8DyrDT8iPXwUnqocZecwKWa18zuf5/u1lf+p3BiGCFj3CP8KBTaFR9Ci5r9XDyTcZv0/b0qvz/fClfPWGmibRL9CPCKxOIPcQfymCRoM1Dah7pC/elHkcH6Yrq5i/NA38+PgJc3blLf7R2Zfv5aigeSqvYUslwujaMUQoM7gJFmuexIoPmxyEtiyj/B3jNk5Rv+gDjyEHh/w9jO54EUfgcA2Ja1NlY5n5GUYLViYrpoig3hUHWeudBYqEBTvpf36L845W+/HXZ/6snK5N6RN7qu3/PEB9iFQOPM7i6hdm4liIRLjnJo9nrJJd076uWhqkYqKIK0CV0fsYsNimlULmAe6dLWad4cUteP+4IoNYtfilW1oCHhTJzgyqTiCjalTuOEzjq6pqnQtsItfhqrLx4tK7rj88V+5Vkphn1vkSBrxh73rLyWClaFvEPYjoHM15A7+GwzKh96w6W++/ngfdQ7XHjxp9WsWCqTuhXdX2kRrASNoPLuTGfQR0fnwTj9vbrSdbSajijwWUuU0FrKQ3fAPeCEZgAqjFqVI6/tpe0gryxfF1oI9i/qPeIhhH0oh2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?slki5nd5cbmJ55AWJl+LQgcGmKG+REzKKPKD9L7z6ho+gn/ubZJUssj9jLdz?= =?us-ascii?Q?t3pB6p9+Lckmc5TXi2TYY6YbvLKLcRtMWUHs8y/WSB3PgsvF8mM5QMdpdjOO?= =?us-ascii?Q?RQNww+dbgR/Pfpkg43vPxGlGoLWBDrkzOs8WKQ4zHiGypY3KGKAKiC6t8Khn?= =?us-ascii?Q?gmXun/oJFUfASXUSkAC/ciQj0xAPTiUHEnkzeUDY2g5/29Q5PD9ZcYZN9lBf?= =?us-ascii?Q?KAc0PjHBeBaGxnM7frfVjsf01iLIXVO65bjkGWaOJJqkwFNPjB5ZLti5FjUR?= =?us-ascii?Q?57xRJTKwQ6g6hHbiZOm1OLW+C7GfQMpFBzU5QKvfjAQhaRn0XUWbYg3sNgKg?= =?us-ascii?Q?IlqZZZ3Fav4wKE1/497r+09HLB2peX5D0qb7Hc7o0J/FLroBptf0ftfQxL2u?= =?us-ascii?Q?P1UqvFgOyvdddKvv0Axes4fzkCQQanvCBr412iKCpA6pq7XdBd2SAmiS5mnr?= =?us-ascii?Q?41EY5engM8G+F1EaFAWeSWB4kFs41LWsUtdVF7PV6CdHRSn7V3g3+6EhdC+D?= =?us-ascii?Q?UxBPYLLALy23uye467vytV3nSf6nsPX4YUeu5x+8x9LNraZ5c2u5pKXlZTKU?= =?us-ascii?Q?QF8BiToywbjb2nRngua0aP3RHQNVRPpXAW77Nmt61ylvfsaByzSxIju4n2ve?= =?us-ascii?Q?ZZWtwfIMKxdBMVMPNc8kq6w2KnPCE5LQ5RkA+OFqEbMPRLSXG/Z74liM6NPa?= =?us-ascii?Q?8EgquLSJK0JPeDdkaxJg8mq5iy5NPeaT4bCFlquz+JOiSE5ARR1j5tO84ELI?= =?us-ascii?Q?4aHrcYxw4bbsRwVi/gMtzs+8qW0//G3UVOt9O6KCpEJTv5KmL3OFQ03qfGly?= =?us-ascii?Q?c7mNAZa+q2t5u4degVI20W16Pvu9Mefz9KvL1XX0/2k/271WQ8PqjjwtglZv?= =?us-ascii?Q?x5P7U0cVTJOAHVnecgU+Iyv8A735g2eIxEiqbgtACtsec/L/Fax15jqLtYKk?= =?us-ascii?Q?O8mamcObYE/aszQAowDLNUDaKA4/lWy8oalcDGJXXPZP0iKFceqYCS9S49LD?= =?us-ascii?Q?TJwZTOpQ7X9H87vojWyqSTznL0RY0mYDTy64wgZwjKuiiP1lYdU7eR+aK4wd?= =?us-ascii?Q?Om89fMOMn0Tow5HdG9x9FyLmNojaxcixqSMo5XFuOSUIoj5nKM3Bi3qakw26?= =?us-ascii?Q?MHjFhqlihc5PjIW+G8dL/Itx3qXWnOfSgVlIel4abwamo/RfDTB0dcj46yj/?= =?us-ascii?Q?UsD6xnWqbR7Ye+i/b+/yDj5xuSL0a1YAGf+NrMdTt3gu4fH5Bw7WoR2ozK6q?= =?us-ascii?Q?3j51t00xr1GH/RAnRtzTXqjXdZOBJqBVQtjzMHsURg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae24f4fe-939b-4a93-1c9a-08dc8ae747bf X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:55:12.7601 (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: DU2P250MB0272 Subject: [FFmpeg-devel] [PATCH 40/57] avcodec/h263enc: Remove no-output code 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: The no-output mode (guarded by AV_CODEC_FLAG2_NO_OUTPUT) does not provide a noteworthy speedup; in fact, it even turned out to be slower than the code with the no-output code removed (ordinary encode: 153259721 decicycles, noout encode: 153259721; encode with this patch applied: 152451581 decicycles; timings are for encode_frame callbacks when encoding a 1080p sample to MPEG-4). (Furthermore, this code was broken for most of its existence (since 9207dc3b0db368bb9cf5eb295cbc1129c2975e31) and no one noticed, so the no-output mode is probably not used at all.) Signed-off-by: Andreas Rheinhardt --- libavcodec/h263enc.h | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/libavcodec/h263enc.h b/libavcodec/h263enc.h index 6e07440b30..784500ca7a 100644 --- a/libavcodec/h263enc.h +++ b/libavcodec/h263enc.h @@ -37,36 +37,11 @@ void ff_clean_h263_qscales(MpegEncContext *s); void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code); void ff_h263_update_mb(MpegEncContext *s); -static inline int h263_get_motion_length(int val, int f_code) -{ - int bit_size, code, sign; - - if (val == 0) { - return 1; /* ff_mvtab[0][1] */ - } else { - bit_size = f_code - 1; - /* modulo encoding */ - val = sign_extend(val, 6 + bit_size); - sign = val >> 31; - val = (val ^ sign) - sign; /* val = FFABS(val) */ - val--; - code = (val >> bit_size) + 1; - - return ff_mvtab[code][1] + 1 + bit_size; - } -} - static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code) { - if (s->avctx->flags2 & AV_CODEC_FLAG2_NO_OUTPUT) { - skip_put_bits(&s->pb, - h263_get_motion_length(x, f_code) + - h263_get_motion_length(y, f_code)); - } else { - ff_h263_encode_motion(&s->pb, x, f_code); - ff_h263_encode_motion(&s->pb, y, f_code); - } + ff_h263_encode_motion(&s->pb, x, f_code); + ff_h263_encode_motion(&s->pb, y, f_code); } static inline int get_p_cbp(MpegEncContext * s, -- 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".