From patchwork Tue Dec 27 22:47:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3747743pzb; Tue, 27 Dec 2022 14:47:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXtuSyE5roXePpoLKsRgW1jCCVuTTcOtzY0S4xrTNBuYd5rajy0m6THdaU7axxr0W/6hJu5Y X-Received: by 2002:a05:6402:d4e:b0:46f:9fa5:ec14 with SMTP id ec14-20020a0564020d4e00b0046f9fa5ec14mr17553208edb.35.1672181270737; Tue, 27 Dec 2022 14:47:50 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i15-20020a1709064fcf00b0084c6438e6bdsi3788730ejw.805.2022.12.27.14.47.50; Tue, 27 Dec 2022 14:47:50 -0800 (PST) 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=SGutvEMX; 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 59BD068BC71; Wed, 28 Dec 2022 00:47:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2064.outbound.protection.outlook.com [40.92.58.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B830668BC68 for ; Wed, 28 Dec 2022 00:47:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T88rkuUFw+ohMuN7yIHOd1bfH1zbaq2tVF9rhmLENnfJ8/gPXa8cEOsKkSmYdwzvq40BwknkLLqaw4gyKonjspK9J0Bvmerd/XTrXfhooJILI5EMK0sl0dRw0u0iqItXQE+bUiFpgIqm497h52lne1zb/HB8fUw7aBB+N4iTzOV/QxJOCfao2+XmV3r758UYWHV2MujdrZbAswQZWuHYw+nDrvnhwI0l17GDFfj7hrnrdwsD8ypvbAieTDV8AOEQnkbfceHkZAhDST+i1ZHAKrq6NDBSFvunXLf/mIz1HTfQJ9HD7hCMM7NdZ7BKCjqAcr6DYoTZsVR6zCV6nmfRQA== 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=jq+CzQ/cmHhUD03/N/pksl5VbPcfDYrYvIETfCnhGIQ=; b=YHR9fw7NVEnR1c+aNc9UDoy5v3oNYbl/aKoUKQ95XqFF0qYZkT6TGyBu/Zwvv+OkHY8CC88ZvUmXalARXB+9jzkt2BhmlAGMX+1GZVR7mHInVO0lT5s0PHL7DS9eStG2IQPaoMnyMDdUXgSQkKJ1cECQ4Q7Ol+pPVtxhsuClK/2zwzI5ywrKQ7xUDus5CVIq6+kSm+uQ9o3opcyw4Lh5C4ihztGvPt9BXv4FJcTByHL1S7fMNb93tRNlWDWVvZ1NewxfLcgzT4QQI8/3SA2vMo9nbGlF8MXB+6oYk0JdTpVJ1zjSYF6kA4+twX80vlgScfOQo5M9C+QNfl5/ANUA2A== 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=jq+CzQ/cmHhUD03/N/pksl5VbPcfDYrYvIETfCnhGIQ=; b=SGutvEMXUligJOOACf/F90tWnbqB0/KCQ4FXMpAzvlVuFXb/FfJgaPYSf3ij7L2+J7E+96gwTjBJOGseqIDevsIesZZC548q6Af/Xxe0rY3sxNiEM1aLanAdmwzJnr9xWUApQCQ95yG/0M7K+s4WbyTWC/XeDmwAbB3iSYhp5AGgt7XJmTB8MvXgv0SCYi8EQIICkwuXFBSegBSZzUIVwNE8vcv/XvNIh0ceQpuC7EijFFc21Tl+X7e2Gntkch2PIHaRlsMfMlC29OUiipkdUbAz/LlJo+7sf+Gv6ASGLUehSoQi6o3WZal/sRDeyK1VM/4dRg8HU+BaIStmJvPMIw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0323.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.16; Tue, 27 Dec 2022 22:47:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5%8]) with mapi id 15.20.5944.016; Tue, 27 Dec 2022 22:47:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Dec 2022 23:47:39 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [UghI4A/awjdie1ARF3RuHfMQuqQ98VUI] X-ClientProxiedBy: ZR0P278CA0057.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221227224739.1181782-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0323:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ecda1e3-5878-4174-ab7b-08dae85c5e7f X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmq1cpv3c3jqXPj698IFbfnCqQVkyGhhG2RT5XZdBjAivJ80BB9rttkqoN0uwx0Dpa39m3hRQ60ljHSajdQy8vdUg99rtOlTXdIEAvQBVZGgJ1SqKG843uBWIp8C+ZfjypHtHMIgCqwYz4PBEc85bhqg+0hS0zKvPKIbrEGRZIUdYj9H59+Yv0evr4gPigj7JZax1pyx0QfedpY6JsTBScqcU4kcyXR0JQRF3+4wl1doA1wWVJRr8zLpa6CClhychplSB212tWOnc7BbmrDgxLLTnbr96F9VaTZDlCA7zWg6UCnJrbQoi5BfiA3D4LBvLy5upWfjmhE+udC+LH6FWaKM3OilmMPQiZB63E/c/tGuOI3FBder2uDMXNzhDvJxZrT9wgKfB2IBBnbIzXrDz2ym4E1r870WKtjkboT1mPZ5BU73Ob5hopq2FEf17Yl5Va3Aqhi+TyAEwyHMXJ4G0HLdPW+LzlY4Dk2oU0DWvJcCPjGjcnAB1m+eQOlIBYK47jcZUWi9pDO5y1WgdWrWjPYOHegaW2RdgOnpBkqP4GKFd/ByqgyMBhhKheW66TG/gyxhYZgjJsuovKRcU1uA0e0NyBwJROnGH0z9kXV85sN87C9t3EWJ0vMLQNz1WUjASQYKKHNZTIEmolCyz4g+ZvnVOi9bfgek+xzrfFcIS7vaMeLF7UNh+fivlV9hheGid+KOtgxcrEqijGPbTz+WICOw5bjQM050KSd0aYtvdEnp1IY4++AFbmLq6lz0jeL0ZoI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I/oTrZ7UB1yDdmUdyKt6f3Huj/h2eyF58lnV/bT0mqt1cAh97bXd3kBv+3w2cesONplZ39O4D19tSGDeYHIyajUjGrAxmbZ2GD83iJ1E+hVTtQPWU36H/rk4JrE6euT1SO/+uFxlS1JkqCtR5KmGuCCV+HeBB7kjULRjgjTwBjpMR6GgVjZtn0t3dhjNpz7R2+sieV6Q0ZwUR449DIVI9rf4Wa6J1/X2WIv+21fxqlXHKhKyqVRKkxd6AgnsTViC7cbnSW0n5J8o/sykkCgm6gsJtj8Rx0NP4TkqQw57lxw885OVwR2MyFkc3+eqbUTTxlM9xb0H5Ohob3wjVsxM6Q+pXf87/0WR1np3xYrxBL7ZJ4CLHHfyJNpTRIZ7m0B750R6IPiWdzX++P6A4oJxEOC5rrBWnY3RyAdBGAGgDbWeF3VF6cLlnc/FKv2YLBALY5aSWWSfdMZfQ7XPPH2sOkBMTIic9hE5cORNHTkztQFjAGxOv4hBv3DIEAy8XfHwSIszL3nFVX15H/cjPIWM6/SGIbhOgjVchsoXedVy9uU8CoLPu9XNUneZg8OiiVEhophX5QnBThZcEcXx1ayjTOVR7S3NYsPQYvN5909KeavpOFBtRs6q4w/ID8wvm28/9lWroDVua8CPPGT1xzTI0YCf2Ru4eOVTYKH9Tw34HDU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BUWKRaf2QapQWgH2rtpTPdTD7PgdILaOt6V6K1ATYaEnkdUBanjmW65/EbOW/kuf8+ja1BEt8QKAPqtl7Z87qT1gdJO6CNKjGUJfi9M8aj+bcMymY1ucoCA4fXL1z1LpmkT8sS0QQCUKq/6TwqkjfpuZAq5k9UlSriBKcpd7qKcXhZ6schH6Vydx4LMfKjUkCtvZjDoxyyG+I3UWdIT8G6TBge/GH/z+Kjr8OhheADlLHamgTIzPqV40Dg5g53q+8fXQAAw7EQxTk4CmkW+FWuh/ZvrYwxi0ej5zlAMe3wBHcRdDSaRdkC5FcXZb4qB3eTmNkxzKlB7Krsy6XIvrESA+R8G8XYAr6F4fWrvDpSNRkciC57qn4bBr5HghHt6XAyIVZ5FSLXiy9P8obE/xDWaDB7M+dpP2Gk+v5Vgis6uCSMi1X8pMZ0Hc16Ld682hqgcKjwY7AKzYbiUIQUQoxyt79C4Jg4MRUV7gp3FMB5jkhRqjXJbDiGyB0RPdxHd6IeCz0nXqmEhg/T5MVbFQYgIfRmjviPK+TA/g/21Z1zZ+h1AeBrUHp1Avijmy80EHwA9JNehoicnaZkyPoym5KZYzDFlCSa1I401UshRYst/Tavk8ij6Ae2qy2O/WQlJrAb9HAIYaHsBmLvHa/jSW2RdefPnJTFP+7/qavw9oiVcXCYPW9TOU6tchkxvUSd3O8dOciqm6uWkJbE0rNRqIs2yd0TxuAb/L0QgPsCI/VrBcU5Fej7MKsur2lFaqZLSq0bLjPG1aicJlax+jH2upEbpcvT1hIO/dptHdsJgE2wU/SnbzqoZ7ajrJvL857eh3/LZ81ypIzcsYyCwIuDyQjS02lppNkvzwFU/ENj2zikeO8cYObPzvfcC277msyibK7Yj9JjQ0SsAwfKbDL7aeyx5JZstVejmU+6L2EX/To/UAM9w3b34anhH+EqR1uKiHIYurCbyfNyZ/03VPbXSyIrVP8IvkVEta0xPFAR367uZg66yAqlVNEQRjAc4ohh8FqjoTUVsnZ2UlO4XRmG4J5mXrRuV+uYnIWa0lbzAhzeefVshZH+t89MOHRtyiQSj1JZDbynT4sSMHPRZcDDueX42jSeG/Kaq7cRi6v0/qmsdA4z/fpM85lGyIa7Lh+QKiP2EL74LNzDxhc6bIvIj4w+hSCrajN90TRL7vhSoc5ZdYPNVJ3VoRAmLfBZDQBERoqkLAswWnp1vKMQOEB22R3ETVyTY/+bFuz+0wm/umIgx20cQ67cIuEL6jqGkjW28gIHT52MkByJA9JjTxHeRWZZanfClUDHm9jQm8B72YYYg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ecda1e3-5878-4174-ab7b-08dae85c5e7f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2022 22:47:44.8375 (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: PR3P250MB0323 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/flacenc: Don't reload bits_per_raw_sample 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: Psk94EYH/JW3 This has the advantage of allowing the compiler to check bits_per_raw_sample only once on little-endian hardware. Signed-off-by: Andreas Rheinhardt --- libavcodec/flacenc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index adaaa77b79..cdb823a290 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1574,23 +1574,24 @@ static int write_frame(FlacEncodeContext *s, AVPacket *avpkt) static int update_md5_sum(FlacEncodeContext *s, const void *samples) { const uint8_t *buf = samples; + int bits_per_raw_sample = s->avctx->bits_per_raw_sample; int buf_size = s->frame.blocksize * s->channels * - ((s->avctx->bits_per_raw_sample + 7) / 8); + ((bits_per_raw_sample + 7) / 8); if (HAVE_BIGENDIAN || - s->avctx->bits_per_raw_sample > 16 && s->avctx->bits_per_raw_sample <= 24) { + bits_per_raw_sample > 16 && bits_per_raw_sample <= 24) { av_fast_malloc(&s->md5_buffer, &s->md5_buffer_size, buf_size); if (!s->md5_buffer) return AVERROR(ENOMEM); buf = s->md5_buffer; } - if (s->avctx->bits_per_raw_sample <= 16) { + if (bits_per_raw_sample <= 16) { #if HAVE_BIGENDIAN s->bdsp.bswap16_buf((uint16_t *) s->md5_buffer, samples, buf_size / 2); #endif - } else if (s->avctx->bits_per_raw_sample <= 24) { + } else if (bits_per_raw_sample <= 24) { int i; const int32_t *samples0 = samples; uint8_t *tmp = s->md5_buffer; @@ -1600,7 +1601,7 @@ static int update_md5_sum(FlacEncodeContext *s, const void *samples) AV_WL24(tmp + 3*i, v); } } else { - /* s->avctx->bits_per_raw_sample <= 32 */ + /* bits_per_raw_sample <= 32 */ #if HAVE_BIGENDIAN s->bdsp.bswap_buf((uint32_t *) s->md5_buffer, samples, s->frame.blocksize * s->channels);