From patchwork Thu Mar 17 12:43:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34810 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp866895nkb; Thu, 17 Mar 2022 05:43:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw82DmLmNXxZZ/8K39sHtrDaB3uHG3mFz+CHrzicaUQs2V5qRo0+0Om2K4twAzXNeq9dVIj X-Received: by 2002:a17:906:2a92:b0:6cd:4349:dc1a with SMTP id l18-20020a1709062a9200b006cd4349dc1amr4168623eje.648.1647521025743; Thu, 17 Mar 2022 05:43:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o7-20020a509b07000000b00418c2b5bebdsi1397371edi.415.2022.03.17.05.43.44; Thu, 17 Mar 2022 05:43:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Z1ktEiZ1; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD10E68A631; Thu, 17 Mar 2022 14:43:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2104.outbound.protection.outlook.com [40.92.90.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60518680205 for ; Thu, 17 Mar 2022 14:43:33 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ye6zdtpJDVr035GkEBoKCFy/L9YwYGxCwMbIQeYVtIweQnOG3HAm9RwFfHEXUOZffxte0qFoxJcKZ6z9cnCHuzorbuim1/IaHIuMGZOIu8b4WeodmEHTKpH4l/gkmHHTnpUuqfZNVjqGzeSFiQ4nDD1VDRGtQ734K973FoUG3yJdvG5cYjxpw6ZfGdFLzN9Pj2k+XfHq7ghSV8AhQXJocjwAwTSRYZ6ZOqgvWrxzyAQPNkrEl5dY7GugKCBjjS57MnSit6Ryub9ObphgTYZLTZYLB2R97yk5C62uIMUEoa1osEY+Gh+hCBRu75x+nSlfIc7FivvVeoBy7sqbCL31yg== 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=sCdb2dwXh6acoVqUtEaZaAEZ2O3I55Bcg8rjRx29QQQ=; b=i+9yo8PQ8inoow6qlMouNVHuQNkSXH08wha3Y3bJ5c5U2d24iV44fpA5mAItngs0q+AOpzSTL0mAH/XpKYwZNEEtYNt2CVe9HG+S3fXISHBobLl3u//C1H/ekIaXyxR2GlaN/bDXyYOTwg6Ytqf5yM3ql5fjym6awQyf4+Dkq6sooHaYad5fTeNyuQX2zxgszunPxlAO42rDMupAOu/FUW58aHGqezWC4ITVe7Y+ZLN/iOyJrK/Zt0GdZs8jUtKYymKiFuoRvsVUcr8M6+0xX8/gbOHwI80s1I+cRGQf0rUe+TaU2GADo2OJWYcxTUnNU6+F8V+ForCc0N/jpYI9cQ== 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=sCdb2dwXh6acoVqUtEaZaAEZ2O3I55Bcg8rjRx29QQQ=; b=Z1ktEiZ1kyN231G/BDII2dAnutOqKLMqoZGUPnJapbFvGlFDiE/yKDemuwzVM7WCh3tq2nHCuG93uvjMbtf/PkQd2IqthhboMACv9BAhseHEkDLI+tWAykXWxc3S/YHi2N4o7PSrahv/obLzbXl8SVeZZgg2h83K9nSc4XZgsKTF464uXcmNheV1+ab1fC3QqzeELCKx2gfXXFZFL4d30zCV6+0wAcGpITF3rhwW+VZv3bNLCdGY7R8PJQ23G1eRGvOOtQUcYeHxkH6JPSWDTv7Yu2Uwb6MYxRStY0j/+IFfJbJh8kOOQSjxNvIUJ4ADoOY7NVFPDIrQGUdxjn+6qw== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AM0PR01MB3811.eurprd01.prod.exchangelabs.com (2603:10a6:208:ba::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Thu, 17 Mar 2022 12:43:30 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.016; Thu, 17 Mar 2022 12:43:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Mar 2022 13:43:16 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [C4YYn/cjYRiOwG2gIK4t2u1r3W0g5vOb] X-ClientProxiedBy: AS9PR06CA0037.eurprd06.prod.outlook.com (2603:10a6:20b:463::21) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220317124320.1123436-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa60ca70-e088-4c5c-2e1c-08da0813bd37 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWOqF554eOqJZAmA161EiKR0KPbNsEdVV0sRMYAkimzZ3v43X6TzZ/kR2o0poIyc3mkZDHjDOL0d94gIPLtr3cMpVUTpy+tt7wilhlshBRmOmPx7D+Z6TeJWrM/7U4UFgSPm3C3g05qSaH4vTLLryKwnBJydfNHU1qruUI1DOUNvsKpeCASD1uEuxnhtNt5IASN7TVFlayDHqISoWG1fbEniiacdIOPes/a64r4T2OBeIMiF/taa3tS8iZY7Ha+nczgQWmGgmEZR1BXXri/ZPZkfTQX3wx8reZIbDlRjjQFKvwCOP1TMRjgSRNJefjKJoSWaYIxlM42WuQ37q9sTC6rER62qqOrKmVhWdx3Im2uYfXP3JWcvkSE40xOkgwvbfqlYLitou49lSAuRJ3teiK7PHjwwFjk2Qqbw++WCLsCClq1lN/y2Gv6DmmzTrnJ94ncTkxyx94ZQjlOnL6mLvga1b0WDTFVVaDrOZ7q7QDvbNZZCx6MPnypm++DPaw9p1JIarKMZZDqtDGrk8xa1za55jSQ4QkC1RdlYW41o0EagmDEcK6OpePQomonqCqDpNdvyopI76ghYs46Fa8P1AiSInl21GuMdE79BmNk9ePgq98Jv7Sdez0xgTVa4Oima+t5YAipqH6ER/uaRIDcIfnKYmwsatyM5hTW6zYJbB7ir0itsy0zWvMrAOZzkNGHuCnOV17LQcUPSWnuBR8sJmkP5EQfHGtI9vA= X-MS-TrafficTypeDiagnostic: AM0PR01MB3811:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hcQWruQ4dV04GYmKwez/EmmC8BHqGH+BBtiWkQLLqfhYG7VWEg4UYVpwdcMZOsT/QmGwfnST9lA42vp6DxGEKc0WO4KT65xsEfZPi5Tv+hHwUtTNftJ4HusjLsW5keHExXD3vzRXw9pdecvH6roFtEB4LZF0cJ4MPcVbH/ju9Loke7upkhLaqqZuzNqtpYgUTGtTxAVVWjcxO2zktpiSkMbMxW46U3uYVS6an2POpcR1YpCSoZc0H2mpwEwn2xjkXvm7VauxeZmSbNC97gkdgUV2KOHjfVz7FKa8kJJ4VJTDubnpE2qUVnYsWriSTGYFnDU9YJNN3PzDbOxY54Zy80optTG8+Kr83T+hdmPpes8S5J9S1QyQG3hh6WOem5ApkvHZBlwBNa3VSTQpFpKr7q5wI9xaKd1SqRm+f82zF1uGlXxV66evuwk2UupbCyhedK7rqARtXwVy65YF6ZbWbej8DTsr5PNWkaSHy5gA0bXZm6TDDaOrjs+sgbLNCHuu4FqFb54JJGZ6BgopI+PMacY21U4OYNf1b9VpNpw779CCWeTp6973UMxrdiuglVzKQQyJf7wxkfpQfTGs+ihf+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ptNjTYLHkaXk5F3pO+cGrdX/PtXeS0wkUkinh6btnkJ3acUkBqhGdzX7y1mUfuZfx0J7WPxOuo7+aGG5fYdA9f8mCZiiFFxuDcltJrgysbsYX4yZLJNEOtHv8+O19miaJW+v17wkkeddlBvZlI+8V9N+TDoqy3uHt71czWfk7nBb2gGg3RA9ug5qjn//FRia63xz4mPg8RYMbHbXnmXnLNaLC26j8dpknzUlK5Iu26gXTtN+DU9GwkgscJSCmYMIYdl6pkJ1+cM2oYvKXL84iU5X3WlYp6y9WhG9xBH53/1gI9p9PKRCuziCKl7JF/CsO1BQlc6r0DGxXN9lzKZlx6ba0QJGlFZOqlAkdoqZT9qDzGWgMfnhRj+TA2y6vcFz4B9Bnds+V1ysEZt37FeOU+AsbNWtSEXBxCYcf4oWmEkvNluW4kJJt6k7rGiTriIkWgo9AMQgbul/X3Dz9elG9MHlLX2BcxwBRdi4m1dTZLsVVF7JCMSAaDJY9e/3U2qqZxjfHlw/e+kx8v2Rx7ixxrZ63wUnMvzZv9HtRli96xg7AOjKOCf7dROlOMdquls/QRbodpyRW2dG66cO7v6ljLejXcTqfK8zuoNSkAOUuAVdKfwU+c5YNdjgJZrVgButQSpp7rjnz49nYs2uOxr9P25DzXXc9yoCTkPuYRyF0QsjFCbnA4kqZutI9A0WqryFMmlbFUc0I8H0onmp5dWnPXXrjVzqSBHsqVbFxoDDQ9PplTs5qeQY/6RR948HOnWEW9Z8bZcqrHkWqjbsZ/BVFCxxdcMHAgRvgbS8n9eubKr+zBXnD1R4iAzFdub4E+WuofDXVDKFXl8sjFSt//U71nZs0v8q7pAdbb2VgpAU4AxXwGGjBSK5yC2rwFmvUIIj+MR+Lu99CJpfAdZtkGNeZLpPkyH5wOIhqcAiAHNsvGp9MVvuSEOVex6u6wh5EM/yT5ohxuk3s4HC8Vn0fHO7HCZWu0WIY+UlHKQTqlP0PlD/wyLl1/HAbZapR43RLdrTbrt0VpPp7XXTd1nihP/Vrv7t6X55CX73t3WIL4WCoZCDaC33ZBoenjlGoqM5HBxWEilqXX8trBVI+kWLUPu26hLkuMA3xRgmG6agPSnQBDKhrHJxSbis02X0kcKi7K+9EhtnQc7QihLbJ0UKpeKUFo3E5aMJ+LXZ1gwXJMz/VPI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa60ca70-e088-4c5c-2e1c-08da0813bd37 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 12:43:30.2475 (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: AM0PR01MB3811 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/mathops: Move bitswap_32() to its only user 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4Nw4HELuR9Ek Effectively reverts eaff1aa09e90e2711207c9463db8bf8e8dec8178 given that bitswap_32 is no longer used outside of bitstream.c since 03008c2811ec26cf338780a89b6b2b849b399e3c. Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream.c | 11 +++++++++-- libavcodec/dstdec.c | 1 + libavcodec/mathops.h | 9 --------- libavcodec/mpeg12dec.c | 1 + libavcodec/pcm.c | 1 + libavcodec/s302m.c | 1 + libavcodec/s302menc.c | 1 + libavcodec/tiff.c | 1 + libavcodec/xbmdec.c | 1 + libavcodec/xbmenc.c | 1 + 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index c948c889b6..04817f9a84 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -35,7 +35,6 @@ #include "config.h" #include "libavutil/avassert.h" -#include "libavutil/bswap.h" #include "libavutil/error.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" @@ -43,7 +42,7 @@ #include "libavutil/macros.h" #include "libavutil/mem.h" #include "libavutil/qsort.h" -#include "mathops.h" +#include "libavutil/reverse.h" #include "put_bits.h" #include "vlc.h" @@ -134,6 +133,14 @@ static int alloc_table(VLC *vlc, int size, int use_static) #define LOCALBUF_ELEMS 1500 // the maximum currently needed is 1296 by rv34 +static av_always_inline uint32_t bitswap_32(uint32_t x) +{ + return (uint32_t)ff_reverse[ x & 0xFF] << 24 | + (uint32_t)ff_reverse[(x >> 8) & 0xFF] << 16 | + (uint32_t)ff_reverse[(x >> 16) & 0xFF] << 8 | + (uint32_t)ff_reverse[ x >> 24]; +} + typedef struct VLCcode { uint8_t bits; VLC_TYPE symbol; diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 0458856580..3ea3f38eee 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -27,6 +27,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" +#include "libavutil/reverse.h" #include "codec_internal.h" #include "internal.h" #include "get_bits.h" diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 1c35664318..239e0e492f 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -25,7 +25,6 @@ #include #include "libavutil/common.h" -#include "libavutil/reverse.h" #include "config.h" #define MAX_NEG_CROP 1024 @@ -240,12 +239,4 @@ static inline int8_t ff_u8_to_s8(uint8_t a) return b.s8; } -static av_always_inline uint32_t bitswap_32(uint32_t x) -{ - return (uint32_t)ff_reverse[ x & 0xFF] << 24 | - (uint32_t)ff_reverse[(x >> 8) & 0xFF] << 16 | - (uint32_t)ff_reverse[(x >> 16) & 0xFF] << 8 | - (uint32_t)ff_reverse[ x >> 24]; -} - #endif /* AVCODEC_MATHOPS_H */ diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 6110e63af8..6b6cadeb05 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -34,6 +34,7 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" +#include "libavutil/reverse.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 1e83b356ac..aaccd86199 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -28,6 +28,7 @@ #include "config_components.h" #include "libavutil/attributes.h" #include "libavutil/float_dsp.h" +#include "libavutil/reverse.h" #include "libavutil/thread.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c index 2c0cfc699a..d90549e487 100644 --- a/libavcodec/s302m.c +++ b/libavcodec/s302m.c @@ -24,6 +24,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/log.h" +#include "libavutil/reverse.h" #include "avcodec.h" #include "codec_internal.h" #include "internal.h" diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index ad5186d69c..737fc94697 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -21,6 +21,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/reverse.h" #include "avcodec.h" #include "codec_internal.h" #include "encode.h" diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 88ac838587..fdd3ae5c68 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -39,6 +39,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" +#include "libavutil/reverse.h" #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c index 0ea5883024..9dbd0ac571 100644 --- a/libavcodec/xbmdec.c +++ b/libavcodec/xbmdec.c @@ -21,6 +21,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/reverse.h" #include "avcodec.h" #include "codec_internal.h" diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index d578eec930..95db87dba6 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/reverse.h" #include "avcodec.h" #include "codec_internal.h" #include "encode.h"