From patchwork Mon Sep 26 13:08:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2238821pzh; Mon, 26 Sep 2022 06:09:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6gmBG2XtlEqHumZhCFPmwcFTueWfxuP7O92JPCcVS6SJ8H+Dpls+zO8kltyag+YEwgsxJY X-Received: by 2002:a17:907:94d2:b0:783:e5dd:9c79 with SMTP id dn18-20020a17090794d200b00783e5dd9c79mr51879ejc.18.1664197731292; Mon, 26 Sep 2022 06:08:51 -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 dm10-20020a170907948a00b007700c3ad033si15615630ejc.565.2022.09.26.06.08.36; Mon, 26 Sep 2022 06:08:51 -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="EWb9s/W7"; 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 64E1168B92B; Mon, 26 Sep 2022 16:08:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075087.outbound.protection.outlook.com [40.92.75.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 234FC68B5C8 for ; Mon, 26 Sep 2022 16:08:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hhuPKJ/AxhVxUmJt8+cQhmOTpjUHMU8KjT5BCS79I25ggnsia8StI74rPF/YxKMuqyPfK6qCjbBKEvo/6A2u4ddcEAPKqqrPEf2u3z4tJ4cdC1RqzztR3ih/LZ/Y/6k+SbZTuJWqSqzhyfhsc4pJaRx/ksQe+pvD4MiGkLm7rJlliZle8ADffx5P1O18nboNqWZWr6/u1ejK8703wpf1irDQ9fHbjEZ0PctN39mvuXOv3R2kocDSsE7vsNOujI/d8WqaZ681xPdD1Pn0qU54zBRbUELlHmJWPtQPYyGWt0SK0xxt4qN2LLleLcsgEtuoQn44wMklboet0up0EriYZg== 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=5XGJjdhiEkCSQ/O0VvgDT9o9MhDq/+pVGEK+leBJjFE=; b=eOP1OLav7HIJfmwPN7ZMgeGsaQkuJDV5TMiaWCZC3JYdZSUlJeZxN+kV31Wt6xYHsG2FLyIROwoSZR+pBHZacMH+MvfVppQFiizT6LEdW0lKVjTubcogLgafbQd2u1ntz0j7IyvMSCoJDXRSAM/ZN+gSkMrR1OKKpEQTLPO2giY/KWwS4TSnVXkawH52RTlcH24BAmkpwHPAZLCTknHF6RESEIP1BWLKq1CMz2zDaNsGThFv4wcidhNt5z6Bj4khbq1JkBly7EYaXN+blrrDFLV3tT+m1BELWvRovfvJ71uK5PAPTTDTb0DvZ7dUn7NJ1/Tf2zm+Oi9oh2TO6WG/Uw== 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=5XGJjdhiEkCSQ/O0VvgDT9o9MhDq/+pVGEK+leBJjFE=; b=EWb9s/W7r+ZI2Yy7F+JAR3MrSvypfC2z9vwcWjbCVAhA4KP37XUzX3v0xKXsn5p5nL/MEoO0I6DhpKQoibVl+563bpLRx652FMwSk1NfQDfWpUVK5yAkP1B+Ij2WR7e7xKS9BMGa9Az0MOAF2cxDydm4eQujHlFekAIVO13cCmaKYSeBb8C8jd1KaX8VztcXoSTMZHHitoUznriPNGDeTycnnqgrxfcCsQ/s+SCUhzoKwuPCXJ03LG6Mm5lXTYK0Rt9A0mLDDDhdyamGqBwUssgju0Ib2Wvb+JO2R/CgjpPfv4oTbl3fMP6GhqEsrCkwkLzuq9VsyXpvhbDGc8tQYA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0179.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.18; Mon, 26 Sep 2022 13:08:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18%4]) with mapi id 15.20.5654.016; Mon, 26 Sep 2022 13:08:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 15:08:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [bZDURD+Rjw0Txn3V+HxoYR+xXBcAINTNowh02MA2nb4=] X-ClientProxiedBy: ZR0P278CA0190.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220926130824.3555554-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0179:EE_ X-MS-Office365-Filtering-Correlation-Id: 2efc4fd0-c62f-4291-a7b4-08da9fc0326a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoDoqouQ984HRhRYX7I4zMhMSu2hyrZc3jlOr7l+hRnoiV0kuxKpASk8/jztvBTcurxs/Y5Y8nssz10JZcFfsW9pm2FBOwFcKR9atDDi7YCgHq3XJLbo/VrrC53EhOgi3ng2THBwVnMX/g1AYKz8zRtl1U0EDCGzSj2/dZ8VsCIPCd6kpR38H6NnZ1UiCrTqAMkJN5VZzus2ba4QptnOVpIoSOdUx6Qc4YWF1jlQO2BKl8gsMGj9FNmygKiDTz4AWzIfyR4b+lNcxN3exZfjX7PmuClvhn4FRGA1EaYpsmh5tmx+/CPQcb7jOsIZGymYf4OhM1HKGc2x8UmOK2cI0s5iCxtAZsJfEVSTRmgaLqWXumVD/gGospno9L9UzD3gbglCpe9IyAx+tCNMlmDUil6sQyKQJg1hTZM71QpKQxK8/G6uJk5koU/MliDIgbYH7+PU71ZB/lQuUynaK92X7UZS4H5Wl8a1vuYWrKlkwurZ1tUbMwa/Ny8K/t23kMQ8cnM0OyUDalILOk1ol0BrO+YwCSJuCD0O4yPrLYPRyhwDMjATmJSWXi2zjDM+RL6aRueIkYPOqy87POzY34wFCsrURnt9O7uGIQ34kkYtli7hJekkOpSNIxdYsgNPNsGZ2o2rW7E/vuWzYLl2cuNeoPgBsQn1o8GZwWzMz1yzBx5pOkujLOIMRkhrynabOu9BnKBFCWL3kMOTfN4bS3aqtWnq75IMWwL2hcg3h5z2ZvXa3fLmAhLOf/jcOsaHnKkktI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eC0Ka5M6c2HOIFG4ns0J7KHrtGTzxsCM+phqpf0WsbB3iZZ99JFlC4Nc7t9PFmhpRdpmJsjKbYynq1j1W/X9RmgTw1TB6RWgEw9p8Ymee6AEl3xshwPKnNCTojG0Q5+oYEQwqrPm/p3YexOnymn+03/q2hRz5cw+3yCjghBE/z8GfYGH90B9L+RU25Ga5NhDN+BFol4aDaHPkzzEGZlUy19+MdwIhmOUOG+2xoKsD/jhdRjuUVdGiweUte3b5DSFg6r6thqIp/J7BEZ+AHHJwUw4zPjfC+sutecEU70ClSeA789EdiKfNYxnO15VnzcuMSEfR7isl8bNd4EqDrV2d2e491moypHjvG9n7TqPRhUdBBsBWYazC1LZ3nOWY8fbyYfzHLodSe+b2qz8X+aw3fJr4IxFFXV8LLh5JdSJrM2lBslevo6X04eOlgB+UVCLsgD7qUBQgySgqeJ5TGlx2qQiJZwoW93JdFe6I1eDY0zHeGUyQRA1y5UjZOQ2De8KJVyBiz/XQlElrqMHsUUf2clXsNytq6WtHNX+GaCgflXPObf1BpPt8zrdYQIuC2XhJPrea38IwplcUvVyemf+fTqXUIPKyUJsiS/+D/LWPYNXCB7FhLkk/HC+OSnyYQefB16yjdtrK7JX/O9ukdi6Gg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YKQWBWomSyozOueiUAlDQ7cCLGBbs+R/PZ2i6IMLU4QrjKkkowume8nY7JEF0V+95RBVZOx4kavircDeisz2zbdJo1mZymrf425WN5i8HFRg6xP2ODWE6GhrTyi4dcgNRzlvaFWzhj7BUejNQ3TuRAXLUtlLRrxaxctz4WPYPTuOKEfXImFm489cJZnc7BQ2nOe0kHqo6/mt8apcr/Im+J9S0VRCkb1BphfpTDlzSAp+okh5wzSdKYWktqo5k0Nve4/64CNtqSifQ1FXIXpsfj4m68Y9to7oqi0OWiaXd8QbJJrKcnUHIVPkVEWvPDE7EeJujgTJhqG4Z1vVEaXgKPWHMREBzhBVyTMnQU2Ap23sYVcrCtdnme0qvnNdoLavvJ+uvTYRiHTM5a3uhjur+xGMguPpZ33/OJAzBBWJSFgC7pFicVJpmqCT8Wn0kYVQbW/MHyp8mQVf1w4bq19mPgrv3v0Q/NPZD9JMK71ABZXcJBCEIl6ykxBwiwJ7W3BwG4jfvQS2UZXrd5s9FQgEKgek/6uSWI8wgQj5m67lz9gA9GCDOQscRrVjH4L+yzurPnEcTieidrZBPU/ugEB1FsMu8mbqBp0kPCO9Ehk6n+Lggv8VJgh9l6OYncEO7auwYsO2LaW3KOJ0xMDXGsnQ3N19uieq5CGhXfuI0s1xy1q+4bCBoalFhoYhao18Zb38unBxC9ajE0q9JXbEVYq3XcwftCl0L4z7ayMESRzSVDyr/maB7HIjRoH5VkA1dyxu99RknIPYBtq8Sp1itgQwqmOLygNtza0UUnfVaN+pvUzXLFIxGVyOeRP/XvJnCkD4BWwNk6weQG3XdcqRb6xdwxHxdUmbJSxGJzidqLcK2+J0m+qxvtRXG9uD2v9ghSUKeov5vSpy8AbsbsqLQ6v7dpeI2VhR5vu8PqKrQXbvW4y7O0y/3hI9Sl7/qnvXPov0LZixcQ1eyq8EMQ8GRjmVzWr2JTmWGrFf0TTsFqSPgkEIxSoUWGss7JMeKtGpGAYJoSSNdVU1eob94Kntja2j18irnZoUFLfLL0lsGy964IuReODHJRHJz484RtdLmjfk21d0DZI4/6DK6Cq61ohkDu51xhgNZfrlHkIN93xH3GMDV0M/JEfp5yma3FHsXA8w+prQORLe+FwhUfM9Sr3yoqLGzfDFNF6ausqi8XkK7t7iPznaqTf7SpIZJokhOdgQese1En0iiUxssXpLfPE9aLX5619L0C6wS3tX71SZX8zBFu+vcxhESV0baRv9Sf9udeh6oh7JJSvZX0zljhZdEuHb+VwZ9XQJ7XU+wtDSGS9gUSq8w1sin69/6cBWPFcR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2efc4fd0-c62f-4291-a7b4-08da9fc0326a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 13:08:25.6921 (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: PR3P250MB0179 Subject: [FFmpeg-devel] [PATCH] avcodec/ac3dsp: Remove unused parameter 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: Y14HwSjNsH2F Forgotten in fd98594a8831ce037a495b6d7e090bd8f81e83a1. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3dec.c | 2 +- libavcodec/ac3dsp.c | 8 ++++---- libavcodec/ac3dsp.h | 8 ++++---- libavcodec/ac3enc.c | 2 +- libavcodec/arm/ac3dsp_init_arm.c | 2 +- libavcodec/mips/ac3dsp_mips.c | 3 ++- libavcodec/x86/ac3dsp_init.c | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index aba8e0fb7f..340f6e1e37 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -236,7 +236,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) if (!s->fdsp) return AVERROR(ENOMEM); - ff_ac3dsp_init(&s->ac3dsp, avctx->flags & AV_CODEC_FLAG_BITEXACT); + ff_ac3dsp_init(&s->ac3dsp); av_lfg_init(&s->dith_state, 0); if (USE_FIXED) diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index afd6b557bf..22cb5f242e 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -374,7 +374,7 @@ void ff_ac3dsp_downmix(AC3DSPContext *c, float **samples, float **matrix, ac3_downmix_c(samples, matrix, out_ch, in_ch, len); } -av_cold void ff_ac3dsp_init(AC3DSPContext *c, int bit_exact) +av_cold void ff_ac3dsp_init(AC3DSPContext *c) { c->ac3_exponent_min = ac3_exponent_min_c; c->float_to_fixed24 = float_to_fixed24_c; @@ -390,10 +390,10 @@ av_cold void ff_ac3dsp_init(AC3DSPContext *c, int bit_exact) c->downmix_fixed = NULL; #if ARCH_ARM - ff_ac3dsp_init_arm(c, bit_exact); + ff_ac3dsp_init_arm(c); #elif ARCH_X86 - ff_ac3dsp_init_x86(c, bit_exact); + ff_ac3dsp_init_x86(c); #elif ARCH_MIPS - ff_ac3dsp_init_mips(c, bit_exact); + ff_ac3dsp_init_mips(c); #endif } diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index a23b11526e..33e51e202e 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -105,10 +105,10 @@ typedef struct AC3DSPContext { void (*downmix_fixed)(int32_t **samples, int16_t **matrix, int len); } AC3DSPContext; -void ff_ac3dsp_init (AC3DSPContext *c, int bit_exact); -void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact); -void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact); -void ff_ac3dsp_init_mips(AC3DSPContext *c, int bit_exact); +void ff_ac3dsp_init (AC3DSPContext *c); +void ff_ac3dsp_init_arm(AC3DSPContext *c); +void ff_ac3dsp_init_x86(AC3DSPContext *c); +void ff_ac3dsp_init_mips(AC3DSPContext *c); void ff_ac3dsp_downmix(AC3DSPContext *c, float **samples, float **matrix, int out_ch, int in_ch, int len); diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index a090576823..279dd5c20e 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2613,7 +2613,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx) ff_audiodsp_init(&s->adsp); ff_me_cmp_init(&s->mecc, avctx); - ff_ac3dsp_init(&s->ac3dsp, avctx->flags & AV_CODEC_FLAG_BITEXACT); + ff_ac3dsp_init(&s->ac3dsp); dprint_options(s); diff --git a/libavcodec/arm/ac3dsp_init_arm.c b/libavcodec/arm/ac3dsp_init_arm.c index 9217a7d0c2..a64aa6ae82 100644 --- a/libavcodec/arm/ac3dsp_init_arm.c +++ b/libavcodec/arm/ac3dsp_init_arm.c @@ -44,7 +44,7 @@ void ff_ac3_bit_alloc_calc_bap_armv6(int16_t *mask, int16_t *psd, void ff_ac3_update_bap_counts_arm(uint16_t mant_cnt[16], uint8_t *bap, int len); -av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact) +av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/mips/ac3dsp_mips.c b/libavcodec/mips/ac3dsp_mips.c index 8f62c03aaf..a5eaaf8eb2 100644 --- a/libavcodec/mips/ac3dsp_mips.c +++ b/libavcodec/mips/ac3dsp_mips.c @@ -401,7 +401,8 @@ static void ac3_downmix_mips(float **samples, float (*matrix)[2], #endif /* HAVE_MIPSFPU */ #endif /* HAVE_INLINE_ASM */ -void ff_ac3dsp_init_mips(AC3DSPContext *c, int bit_exact) { +void ff_ac3dsp_init_mips(AC3DSPContext *c) +{ #if HAVE_INLINE_ASM #if HAVE_MIPSDSP c->bit_alloc_calc_bap = ac3_bit_alloc_calc_bap_mips; diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c index 75a341bc95..43b3b4ac85 100644 --- a/libavcodec/x86/ac3dsp_init.c +++ b/libavcodec/x86/ac3dsp_init.c @@ -33,7 +33,7 @@ int ff_ac3_compute_mantissa_size_sse2(uint16_t mant_cnt[6][16]); void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs); -av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact) +av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c) { int cpu_flags = av_get_cpu_flags();