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 5F02243965 for ; Wed, 3 Aug 2022 19:49:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB0F568B8B3; Wed, 3 Aug 2022 22:49:51 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075107.outbound.protection.outlook.com [40.92.75.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AE2B68B874 for ; Wed, 3 Aug 2022 22:49:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PMMGv9GvnZN7/GwxqCR8ictZ5WO0g6csV5+oxLH28ttJu5m9NWzeLcNxWkerpyRGMVEePaAN4AaHZkQSAEe6rp2Y9sbaRWYzjf6tgFt67pPRX9skUnQoYN4K3VrC0F25DRRhScYMAo/DgTDkivuPpuXk1VsLLCZpi6q8lD7CyE5WxWVZ1MfdQGIRXuWrP/2PpQAAlxFjm195aYYiROKsdrHKWzTKy41jAMCXGPm1VB2hPrASuFpehMdNMHb4PBBB/RpGBT/wIDsFFz1M/5VBMLrA0b9tf1pIZoXFw5yHuWMAAQEGGvQBz47t/RZ/sIOhbQbdsaWWbTZ0mYsp174Zzg== 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=V6hEYscQF1QtiO5jgrTr6bx20rfirWVaKnRSC14qiIE=; b=m2/+1q6Pomu+vCe/D6znMTfGI7i7dxQ4gPzIgiClcb9QOsUGBFaVfEo7upQ65ZJ8V5gjiU+gg0lIkArlZU5aGox9ND13tHryMZygyKOick/5xvFWlz/49i8JpizuD7TYhuv/2Pn853Brz1Dvs2NELl/IhkvBeQEIcE/sWGQNsaKZKY//L+bF+YMI0pxDDNPip6QvZMCBjwOQd5HRsT3Dc9JuoW/wa6nxWHZWPio8yE1qhoJXHVT1cw/VyjDaadU367V+U6gqZJM2fkvrrYGEANrysdoBwlnlipoQZjVJb6VBgDDa6pPoIf26G0ZxM8DPqLsWLp+7348mYRk0VQPBMw== 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=V6hEYscQF1QtiO5jgrTr6bx20rfirWVaKnRSC14qiIE=; b=hh2mojP75ucMuJy3hR+rbiTckagd82KTgE2S+D5C3EH01tpSuVBOhJloQMaRJq2kYzCt0k+Mh6rS2q968CwEG3lnIJOLk0m5AALwRfNxCwyBOt95y3N6lSx66IXZAUEgbu4VxpsT8a42abYqABLEHGbEAVfyhAkjcSfV7aiOL/h4jpShv8t1TJ59LKtZzqnwuImIEajUoPGColdlcjmorIPnYz2YYt1MK/H11mQL2yr+e4O5ipXeDWZ7d1t1MRa92bJpX3yIKV6w0hhxc2DTZU2krtrrMQXA20uR7bH+d0V8ywt0jQ6AQFlL028G5bh5MWCg3jIj0PDVHGZzUGwKfA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS8PR01MB7896.eurprd01.prod.exchangelabs.com (2603:10a6:20b:35b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Wed, 3 Aug 2022 19:49:44 +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; Wed, 3 Aug 2022 19:49:44 +0000 Message-ID: Date: Wed, 3 Aug 2022 21:49:43 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [9u4jWLZ2csymJdduACcWLEWh+NBECysr] X-ClientProxiedBy: ZR0P278CA0077.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::10) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <089e8bbe-775a-4d67-7f5c-850cb170ad86@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1211d238-e5e5-45ac-a9e9-08da75895045 X-MS-TrafficTypeDiagnostic: AS8PR01MB7896:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RhbahkfCZKbFKg6eTTqOvn3rg5Gt94wXNBSvkoA3eMA1UNsGTa0aM64vFeQr48lEHNux01ffLfg0HmCWYx5nj0EZQPE2M6ockXOvddKcTm9TGOujLYNfx+ZnAO72UeG47Bgt9dhf29yv0cf0DM2vEwiFAwY7hH+QGA9m7IE9eySwA81bEmMa4o3/4dgB+v08FLi5jmKXatPr0aTER3VqXzJWsDePSlDlAQBOaRGMi74QBHaQgMzVh1y8CbG7I/a8czdAHjOO3HkalJDQ+ch1rqowIQRYIDEOITjutePfiIHkln2QwUw6WyKUJt1KUbHe5gAlo+1QpoHf76j962uJd3uDfBpe8AEQRoIW0QUxdLz1uyealyoR/lZZI3OIKEmQGoffQfqYqDNX2AmORyjuTI5man0q03oIpNM+Ka1TevZRZuAIIcD7SGr59zwXoTehol3mP/yYkFSrcJ8q2dHBeKjDtiRF2OcMBPbW/YVHGsmifo1mv/6jWPoT3XnIvp8nptfXY5HYZxCp8KqxrqLipymB6Pl6s90ISG3UWLvfvngmWqDuqPV7floaPCLN80goB9AcD2zHOMKM/tP8RFlPJ0Scvu1Ei4+hUm+jwkiQwErFvNK+cbTTgxe9V7qBsfKi8Fy9dZzqEIc6rODshCbaELdLUNgcuHWhEpNur//ODFm3fp5FaHqQkpc1jjCbVJ5O X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q1d2VC9hcURCbmUvbzJPRFVkUHkybUFLSStVQzEyNUJuZVJQWHlvTkgvcTYy?= =?utf-8?B?MVQ0STM4elZVTnNNd3ZFa0ZHbFlpcjRQdzVpZ2ZTQ0JNK3E4ZzEwRm5kYk0y?= =?utf-8?B?aEpBMC9wY1ZKalJnR2VZU2J5MFNFS2RGTVFNNU9PR0QrV2dJaGR5d21oMDBy?= =?utf-8?B?QTFSZnNlYzUrRkZPUDg3WEk4RjhmUVZiWFlxdWVOdUpqTmpFYXhKdkVvcVdF?= =?utf-8?B?VVBWMk9VQWNTSkVyMzFITXZVa1N6cWtlUHJQSjhSZjY0Z25NVEM4N2pwRU1S?= =?utf-8?B?UGlRa2hMNS9LdGRTanNRZTkyeDRaOUlUdENDUHIvM0lIdjRlWW9YM3B6NnFy?= =?utf-8?B?dk1yOG1qT2NzblJQUUNnLzJoN0xhd2lWQ2wzMUg5Qys2Z0pXK1lRaTUzcDdj?= =?utf-8?B?UVNkdCtlcnI1bFNlTEgra05sQmI2b0c5UDF0YlFMWVFBZ09kZi95eWxHZGgz?= =?utf-8?B?bG11elZCVzVnZTIvV2VRbW5jZGluK3ZiRG4vM1MraGliMU9FNnAwRDRncExm?= =?utf-8?B?YUY5aHJZS0xvRkYwd1NmUVlSR1JxYytFK3JIK2Fueld3OVp6dWUzZnJSOXhk?= =?utf-8?B?L1dhUENRbTNxdkFYeXFZaHl6UmorTEIxc1l6TDZ5Vk80MlBGSjZWTTZicTFP?= =?utf-8?B?TDFQM2o4a1dOZWFYTGl6TVBheDJqaTZDQU55cnRNYytHaXM5bDFZeHJ2NERv?= =?utf-8?B?dnE5Q1dMNHpUNGhTa0U1QmRseU9yc0lia3M3emUybXlzdldXdmltNHA5QTRl?= =?utf-8?B?NjhIVWVod1FSQkxDQVpyTTVMVTRMTlg4VWx5NFlDKzBqOUlWdUgxNDdFak1h?= =?utf-8?B?ZHZrS0d6Uk13Zllhakk0OTRjcG91YUZSVjBMalpFM2tudG8wNmcyM0VWclla?= =?utf-8?B?Y2hmK2lCTFVzbVVVRk9McmFUaXI5SzhWRmREWnFBQjczTlRNSHEvaS9heHBQ?= =?utf-8?B?MTQ1MzNSNFo2Snl5TEtwZTR5L1pqUmxGMFRPOVlGOTdKQW5way9tTUtZR2xW?= =?utf-8?B?YnQ2VUNtcElBUmYvWFRPaDJXOW91dDFzWkZzaTc0eFE3WGltSjg1T2tXbUZJ?= =?utf-8?B?a002ZlV2U2tkbFJzMUl2Q3d4VmNqWWFHdEluZlhDUk5MdkFJd0d0SU1EMHpj?= =?utf-8?B?UHgxaGUxa0RrUU9TWEs1N2Q3a0JHOVRwSlFndk1sTjgvaWlyOEZISDZsMGRw?= =?utf-8?B?Q2RxVTJtVzgxc0ZVbXJ2QkhIZ2xWQWpPdEVKNEZhdFRwcmtGUzlEZWpHUzly?= =?utf-8?B?a0c1N0tqSk04TFRuVUJZb096cVEySUMrK0JaOURvYU1EZnJDZnhacTU3SFhj?= =?utf-8?B?QVNrZFcvOGZZZzFaaWppT2lyRERtd0hkbC9aR0FUb21qYmNEMXRpUHlBVFlN?= =?utf-8?B?SHdSRnRMT0VHczhWTlFsYmtmL1dTcDRYUk50a2hZajR0V1ROeUVrdTJCNmY1?= =?utf-8?B?WkExeldVR0xGUk1HMlhMam9PT3hBVFUzRi9wbllkUTlaT1dZMWpPWXBxNndZ?= =?utf-8?B?QUhYRkN3VVQyTDFmbjBwT29wRHgzT2dFc2N0ekJmOFg3SE9PR011ZnYzZnVP?= =?utf-8?B?N3N5NzZnVVhJYStsZnNRNWJicFBIYm9WazZxSDh0dTFZL0cwSCtseHVyeTFD?= =?utf-8?B?V1ZWQTF4ZkdXdVpTVFBTWEwwbkVmZnIrWEhBeGtxakUrM2VZa2dWVDFZNkxp?= =?utf-8?B?Z0xLRzlxNnBpYVFlZllNVkl4VHlzV2RzUUs4cUFqbW1LOEZFeDNOb09MZTY0?= =?utf-8?Q?uP0J4Kgg8rtDkq+1Oc=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1211d238-e5e5-45ac-a9e9-08da75895045 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2022 19:49:44.7027 (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: AS8PR01MB7896 Subject: Re: [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 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: Andreas Rheinhardt: > 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); > } Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ 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".