From patchwork Mon Aug 1 12:16:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37063 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2465743pzb; Mon, 1 Aug 2022 05:17:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tPZfkIan2oCDjMKnUCdqgN6Vn8LUIRw2fB9stlRg6hbamVgbvmZj/bxt9JKgRS0tEAipYg X-Received: by 2002:a05:6402:48c:b0:43a:8bc7:f440 with SMTP id k12-20020a056402048c00b0043a8bc7f440mr15574335edv.8.1659356249829; Mon, 01 Aug 2022 05:17:29 -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 z20-20020a056402275400b0043c2e89d0acsi11716150edd.3.2022.08.01.05.17.21; Mon, 01 Aug 2022 05:17:29 -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=RSvY5xSI; 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 3273068B8E7; Mon, 1 Aug 2022 15:17:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068085.outbound.protection.outlook.com [40.92.68.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0D4168B61A for ; Mon, 1 Aug 2022 15:17:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YhFi0Oh8ITml+Wn6gqLa98eKdC2NWA59Y9uqTvEdXJ5O63PVvF3MgaB3pKMGdWXBq3P3dfOI/+X1G7D3573go+3MmtGY2TYRztOiRG++CRhhDRZhNJk42C4oA2XW4l4Vf4r2vuIh01IO6yADBoNDt938SfZ1JXEBdEa/caJN8m5Q1WTX5q1Z0lawVsdtBVGYAFc+vGxTsN/V2ruPcnovfpapbZ1ia520PUGNYc27omTpw/ztUJVrvO3Rq56L7EHczxtgOP2wzn/kfeRvJ0cm2nmftFeDnhhUCsPyUxU48qGoH/skhB53OArdd9T5wr1PVXLkSrjVulgxf+acIvZ4BQ== 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=G+xdmp1q43r5oPhLSphPSHoEMplk61a0TJHJfwlkywE=; b=hLwgUUzuetlGm1U7BucPn2sUTrRxhs9r70KrwfjJ1j10VKxKtEG2wvKcBT6YuaNrr8BsQtAhLThtkNQnivUTad027V580FHGWTCYmJxK5g5vSGXJMzOAJPEp94Mft5MGPl3NO++4RyXOSALDxW1Xf5D9XNpt8t8PvH4BWjoVTFWlb25UHDLwXynoJhc84Jd/A/Qc/cZtfLLkHWw9A5RveGSVQ2vzeF21s7CMsgHOaim/CZpBSzBdcsHWijKw2HJKndyjqQIcvdV7CEf3ZVntpTPZDu0yXmfALd2i9xZFr80wL1QbIq7rDe6cYk37A8SqWKWcbdx+rE2ba7l15i4H+w== 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=G+xdmp1q43r5oPhLSphPSHoEMplk61a0TJHJfwlkywE=; b=RSvY5xSI0JTQy7VOhP59n6/Zl4j6bZkD6S6LaEFoo4CM5+btCn2bFXJxIkyjDhY1HzifWRDuSCQnJnkDkjyjh4GqIYIwirbJHswFDrAsFHm9p2XWTA329ez2DBHw/7lnRCtDnEde0/M1wWWKXv/KvdMeh4PE4VkNmt0S0dQ4yJ8wepg51yFnu6gSs6N+sNB276gHrsLiKcB0fGgJOlWkLWopr0XSa5AEqwArGwOsyuex2WstKHt5WSyoSQObZZU7/3bn+DwdIpQ8Oyo0cL1aj/ZQQHsJJzbw37u7xgzJqgyob5Dvp6d8PfVeZxAFL5PTafjlUzN+8Bu7lO1FAJDQPA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0101MB2425.eurprd01.prod.exchangelabs.com (2603:10a6:3:85::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.14; Mon, 1 Aug 2022 12:17:09 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.016; Mon, 1 Aug 2022 12:17:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Aug 2022 14:16:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [QNaE5ODuKqJOHp7uWZE1q/cdTMkIWLdO] X-ClientProxiedBy: FR0P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220801121701.3940411-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f65aaabc-5260-4776-919e-08da73b7c180 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVakJMqjhoreY9eRj3hMzSfk2Wo9XoCwx54fQncDcAabv1220bwGiC13AThQg7C7Kjbkc0O9gMoGpJhg5sCHOnoH/MO2X6fiYnsQGi1NAjNc6er1ku/1gskeH6XTlrFp9C0AVySKtZDCgCT1KEcxRki7cbSnm3vVPRo118ohe/M6txkZ4+oE9xu9QNSwgDDoE6etVIkE5RxOXzpAMaTZ8Xd5fuDhU4Bk1E8syyKVlcsFs/zXa3UvQd1aqTUWzFUEm5ZIAccFWMxYB2Hvz9HEvlExumk+Ej7JpiGuvYlpBvO9s3RiZsVr0ITNsCGEnyT5hR/NJMDcVlDX/l+o30U58XtHikeSJcrBRGzDiKvH9p43DNJIyIM7QsIejq8XRmEbcoMOQcqQyHH5OOC5Dem9663lgHYaSvxq3k7qkRjfSz/twnLfM+pVPrWUY75qzsooKc30QntbnaeQESgiGMKIKvhptp26Wcw9guHVtzWeSqtvwULARzM3bo4vlluqhSqAwKl/nbNV3vgqyvV2sced3SPQt7h7/Kjw2Sq2YrCznVJcQx8ZN2oWCaAXN8nQvM0X3PmgVeBm0L/uiKuDjkYlq2k6y+V0Bp01PqS7NTZDJucqmPAsF8fdZaLAwgsYYRLBbSh1bjZYyEETvM3k0qFz6ZlYVC1oik4StQJvjXOYOjJWbPNo2BgzskINAP938XBSvw7s3hBx2ixF5hLp4W5h8OXeO+DxN9YrBA= X-MS-TrafficTypeDiagnostic: HE1PR0101MB2425:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JdFiKQ3wJTWBk1njNiO5QpjsUwi4Iy20gyX9nvoi2v5U7AhXNAj6utSCC9oAdRKqysd9E8cuFZjqwq6JzkBuldFHRm18AVU6Hrl5PztU8h8a8hPz9onkuxgLwBQ2gvKQ4tUO8y3eS6opWWa0ObyWfqqq6NBuRlqCsxFl43q9ejS06Up5Hyv55/cLnpl1QIav99CXT6n8vLuvo91T8cWldAWBgd+AiB5ZCCTxSl8qJ5IxZKk1/Kf4wfUVT9JWYsX1tTFvrqnjzRWRx1BhUrVQE5DM+p5d+UxcaHi2QzBGGiJ4Lyv/wrkR1ASHVZrdjPEbXTRTB7t2D9/Ko+EVzbAHspk6aHJ3nV0ArLlwCorELIFCghiyPfu14nreW4bIPoVeWp4NOcSv3DEDwYwtz9OUSmqXZC92zzW7xiQlvLycNFqV0XApg2d/8VTGqIwfVGyT+LhOWNGf7DomSGMM3H/HOQZfbuL20umNczu5weeaZDflXL1kYlnOSw5K38gnqwn79UdtLhMWIziBcC+vN3d/VHneMOHReUTwQJLa/R4Zj1ti1dbKcTG++b7uy51p3cW/4k+iWY/y7+q+In5si37AHfWDdS1ajgnOEK53iraXT0YagMB37jNOnvSzPq/yJoZRWVahVn+4nSgob0cdF7DQbQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ITqLxvO98Z+vOZKtnBgmYsuyQOZgAG7dTjTwq166k+T4QhNPo/Ojg5g8BeCRyyZtV4Vet6bmUwpp7yyyin5OAWF9pjESPogYngxoBG3O0RqHQjOpoHoYfdUENbx0A2u1lQBmKfvrebptXwi6Af8t6e24nOmBUM6+QMuOw7OcxKU6Vb2cXnkTqVu9SGkd3cuts6ApLcDZgVmeBYyaRkucY2a4GcZZtVrQPc/EMp2U9lsl3Hg3BzfEw1G4ol/o4pcjMXRRgXvazHbE3hJwKh0QZ7o+C8jIcseoqNnFTNblZRaJFYl5g28c9WRh2RxXfUt46EjEh5BWoa1AIJ3ennw4S8v7xMY85Vlfgc2+ryuX8jAmtn1c8zhEBW+pGeAxUmjRt4Ae1kJgYUcsZZDpZolQeXK3VHsVYJXKrRDouQ/wTiFPOyNCue8QWKNrBFp4xXScQVEEEd5ktS5rsavu+AJkdCjbRfAKvgQI0FfWs9fSEBbli96qandiTZUSL3l3VBlNd5FgoZdmuGjhzjiedCp1S6foSKyS/j7Rasp4XJFhpREqhHXMF6Osfb6zQvX7Ghs2Yw1tF7tE8r/hzSh2Moqelk02RbjGJ3MSSDksHTfoMmEj5A6NexkucBL9/idDHGNTHAs9JEIG9QOZQ56eUq2LROeJ7rfk0wqMczBXLnHj7Rr+Etvu4bQW0cplqyuZCd5MtUEfFfToAq4OH1n7wUQgRv52oI8gVqoqdbUg9Ovr4IGVDqRkjRTvF5CAdHpOq5PIZ9wPdAfMwiUBtCQkweTcq6WJbDNkHkkE16DqISAaa4dIEO4/5AdVg38gKdEY2bhC1LonJWFbCh/2D5pG+TfVYH/zuN5ZFn5B6pPJ/BZpVc+tNnNJoSyeGs0sc9PKrMxgWinofiuTR5FFtMJ3+gvAxYO73I2h4cxJz6Jl/vn7Fv8CivlBKtY1KPPXqr/zmm/aCi2Tl1aLmVpn68TYfKhCW0gG3Hj12OI7fQX+K8IxI2GEfZ0rhfrDKvGbA1zAqF37IQnhyIRQ2BuariTrA86pnOxYOwiPTvoqL+f+FtfxTJEU6OAkOPZDwiCBwxONDWYgTTyU8afRCS25GUtlhoiZdoQtAkh39Pkccl/Hfot905HZtfNGQHws+ka/XnkdycMktRF3T5kRgvs7y5meQeXweTfJPXMk+oCrUF4jKpJ40vefxGagfvkYOCaaV1oHxjs61DiTl3iXuxH29ClxA9KVwAay+fe+xfXtaP/S8e1MUzmL+71FZh5zZZbIwoKQmw29UwAw42cbFDQVawcKZeYRpBfoCGnlipMjaqg3xox9JJ8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f65aaabc-5260-4776-919e-08da73b7c180 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2022 12:17:09.2421 (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: HE1PR0101MB2425 Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/flacdsp: Remove unused function 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: 1z/I0jmkCfLC Forgotten in e609cfd697f8eed7325591f767585041719807d1. Signed-off-by: Andreas Rheinhardt --- libavcodec/arm/flacdsp_init_arm.c | 3 +-- libavcodec/flacdec.c | 6 +++--- libavcodec/flacdsp.c | 7 +++---- libavcodec/flacdsp.h | 6 +++--- libavcodec/flacenc.c | 3 +-- libavcodec/x86/flacdsp_init.c | 3 +-- tests/checkasm/flacdsp.c | 4 ++-- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/libavcodec/arm/flacdsp_init_arm.c b/libavcodec/arm/flacdsp_init_arm.c index bac9ff1959..a16de9ee9a 100644 --- a/libavcodec/arm/flacdsp_init_arm.c +++ b/libavcodec/arm/flacdsp_init_arm.c @@ -26,8 +26,7 @@ void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order, int qlevel, int len); -av_cold void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, - int bps) +av_cold void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels) { if (CONFIG_FLAC_DECODER) c->lpc16 = ff_flac_lpc_16_arm; diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 17f1821c50..5ddc5a34d2 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -117,7 +117,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) return ret; flac_set_bps(s); ff_flacdsp_init(&s->dsp, avctx->sample_fmt, - s->flac_stream_info.channels, s->flac_stream_info.bps); + s->flac_stream_info.channels); s->got_streaminfo = 1; return 0; @@ -185,7 +185,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size) return ret; flac_set_bps(s); ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, - s->flac_stream_info.channels, s->flac_stream_info.bps); + s->flac_stream_info.channels); s->got_streaminfo = 1; return 0; @@ -536,7 +536,7 @@ static int decode_frame(FLACContext *s) dump_headers(s->avctx, &s->flac_stream_info); } ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, - s->flac_stream_info.channels, s->flac_stream_info.bps); + s->flac_stream_info.channels); // dump_headers(s->avctx, &s->flac_stream_info); diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c index 79002dcac0..da8400ae0a 100644 --- a/libavcodec/flacdsp.c +++ b/libavcodec/flacdsp.c @@ -86,8 +86,7 @@ static void flac_lpc_32_c(int32_t *decoded, const int coeffs[32], } -av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, - int bps) +av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels) { c->lpc16 = flac_lpc_16_c; c->lpc32 = flac_lpc_32_c; @@ -125,8 +124,8 @@ av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int cha } #if ARCH_ARM - ff_flacdsp_init_arm(c, fmt, channels, bps); + ff_flacdsp_init_arm(c, fmt, channels); #elif ARCH_X86 - ff_flacdsp_init_x86(c, fmt, channels, bps); + ff_flacdsp_init_x86(c, fmt, channels); #endif } diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h index 4a7a36064a..9f8ed38b66 100644 --- a/libavcodec/flacdsp.h +++ b/libavcodec/flacdsp.h @@ -36,8 +36,8 @@ typedef struct FLACDSPContext { const int32_t coefs[32], int shift); } FLACDSPContext; -void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, int bps); -void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, int bps); -void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, int bps); +void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels); +void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels); +void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels); #endif /* AVCODEC_FLACDSP_H */ diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 9350e42dbc..3cfefbc89f 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -425,8 +425,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) s->options.max_prediction_order, FF_LPC_TYPE_LEVINSON); ff_bswapdsp_init(&s->bdsp); - ff_flacdsp_init(&s->flac_dsp, avctx->sample_fmt, channels, - avctx->bits_per_raw_sample); + ff_flacdsp_init(&s->flac_dsp, avctx->sample_fmt, channels); dprint_compression_options(s); diff --git a/libavcodec/x86/flacdsp_init.c b/libavcodec/x86/flacdsp_init.c index ed2e5ed15b..7975712db9 100644 --- a/libavcodec/x86/flacdsp_init.c +++ b/libavcodec/x86/flacdsp_init.c @@ -52,8 +52,7 @@ DECORRELATE_FUNCS(16, avx); DECORRELATE_FUNCS(32, sse2); DECORRELATE_FUNCS(32, avx); -av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, - int bps) +av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels) { #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); diff --git a/tests/checkasm/flacdsp.c b/tests/checkasm/flacdsp.c index 6cd8ac50ef..ef93df8c81 100644 --- a/tests/checkasm/flacdsp.c +++ b/tests/checkasm/flacdsp.c @@ -76,12 +76,12 @@ void checkasm_check_flacdsp(void) int i, j; for (i = 0; i < 2; i++) { - ff_flacdsp_init(&h, fmts[i].fmt, 2, 0); + ff_flacdsp_init(&h, fmts[i].fmt, 2); for (j = 0; j < 3; j++) if (check_func(h.decorrelate[j], "flac_decorrelate_%s_%d", names[j], fmts[i].bits)) check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, 2, fmts[i].bits); for (j = 2; j <= MAX_CHANNELS; j += 2) { - ff_flacdsp_init(&h, fmts[i].fmt, j, 0); + ff_flacdsp_init(&h, fmts[i].fmt, j); if (check_func(h.decorrelate[0], "flac_decorrelate_indep%d_%d", j, fmts[i].bits)) check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, j, fmts[i].bits); }