har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/flacdsp: Remove unused function parameter

Browse Source 
Forgotten in e609cfd697f8eed7325591f767585041719807d1.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-07-31 21:06:51 +02:00
parent 5828e8209f
commit 3a869cd5cd
7 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/arm/flacdsp_init_arm.c
View File

@ -26,8 +26,7 @@
void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order, void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order,
int qlevel, int len); int qlevel, int len);
av_cold void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, av_cold void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels)
int bps)
{ {
if (CONFIG_FLAC_DECODER) if (CONFIG_FLAC_DECODER)
c->lpc16 = ff_flac_lpc_16_arm; c->lpc16 = ff_flac_lpc_16_arm;

6
libavcodec/flacdec.c
View File

@ -117,7 +117,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
return ret; return ret;
flac_set_bps(s); flac_set_bps(s);
ff_flacdsp_init(&s->dsp, avctx->sample_fmt, 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; s->got_streaminfo = 1;
return 0; return 0;
@ -185,7 +185,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size)
return ret; return ret;
flac_set_bps(s); flac_set_bps(s);
ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, 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; s->got_streaminfo = 1;
return 0; return 0;
@ -536,7 +536,7 @@ static int decode_frame(FLACContext *s)
dump_headers(s->avctx, &s->flac_stream_info); dump_headers(s->avctx, &s->flac_stream_info);
} }
ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, 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); // dump_headers(s->avctx, &s->flac_stream_info);

7
libavcodec/flacdsp.c
View File

@ -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, av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels)
int bps)
{ {
c->lpc16 = flac_lpc_16_c; c->lpc16 = flac_lpc_16_c;
c->lpc32 = flac_lpc_32_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 #if ARCH_ARM
ff_flacdsp_init_arm(c, fmt, channels, bps); ff_flacdsp_init_arm(c, fmt, channels);
#elif ARCH_X86 #elif ARCH_X86
ff_flacdsp_init_x86(c, fmt, channels, bps); ff_flacdsp_init_x86(c, fmt, channels);
#endif #endif
} }

6
libavcodec/flacdsp.h
View File

@ -36,8 +36,8 @@ typedef struct FLACDSPContext {
const int32_t coefs[32], int shift); const int32_t coefs[32], int shift);
} FLACDSPContext; } FLACDSPContext;
void ff_flacdsp_init(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, int bps); void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels);
void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, int bps); void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels);
#endif /* AVCODEC_FLACDSP_H */ #endif /* AVCODEC_FLACDSP_H */

3
libavcodec/flacenc.c
View File

@ -425,8 +425,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
s->options.max_prediction_order, FF_LPC_TYPE_LEVINSON); s->options.max_prediction_order, FF_LPC_TYPE_LEVINSON);
ff_bswapdsp_init(&s->bdsp); ff_bswapdsp_init(&s->bdsp);
ff_flacdsp_init(&s->flac_dsp, avctx->sample_fmt, channels, ff_flacdsp_init(&s->flac_dsp, avctx->sample_fmt, channels);
avctx->bits_per_raw_sample);
dprint_compression_options(s); dprint_compression_options(s);

3
libavcodec/x86/flacdsp_init.c
View File

@ -52,8 +52,7 @@ DECORRELATE_FUNCS(16, avx);
DECORRELATE_FUNCS(32, sse2); DECORRELATE_FUNCS(32, sse2);
DECORRELATE_FUNCS(32, avx); DECORRELATE_FUNCS(32, avx);
av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels)
int bps)
{ {
#if HAVE_X86ASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

4
tests/checkasm/flacdsp.c
View File

@ -76,12 +76,12 @@ void checkasm_check_flacdsp(void)
int i, j; int i, j;
for (i = 0; i < 2; i++) { 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++) for (j = 0; j < 3; j++)
if (check_func(h.decorrelate[j], "flac_decorrelate_%s_%d", names[j], fmts[i].bits)) 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); check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, 2, fmts[i].bits);
for (j = 2; j <= MAX_CHANNELS; j += 2) { 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)) 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); check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, j, fmts[i].bits);
} }