diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-07 00:04:37 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-07 00:04:37 -0300 |
| commit | c37e8c0b7fd4a68604102eb4c9d9c9f347c57ad2 (patch) | |
| tree | 3da89fce5778674f4afbdeeb3f32f28ea0dae7f3 /libavcodec | |
| parent | bfb2e20737cb310bd352b46a286a73e7a689e0d4 (diff) | |
| parent | e22c63ac74b2968075be8bf0d2deb1ee63b28976 (diff) | |
| download | ffmpeg-c37e8c0b7fd4a68604102eb4c9d9c9f347c57ad2.tar.gz | |
Merge commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976'
* commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976':
ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ac3enc_fixed.c | 2 | ||||
| -rw-r--r-- | libavcodec/ac3enc_float.c | 10 | ||||
| -rw-r--r-- | libavcodec/ac3enc_template.c | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 9d39026dd5..f10c3b5465 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -43,6 +43,8 @@ static const AVClass ac3enc_class = { .version = LIBAVUTIL_VERSION_INT, }; +static int normalize_samples(AC3EncodeContext *s); + #include "ac3enc_template.c" diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index caa210d5ad..79839df6ce 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -87,16 +87,6 @@ av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s) /* - * Normalize the input samples. - * Not needed for the floating-point encoder. - */ -static int normalize_samples(AC3EncodeContext *s) -{ - return 0; -} - - -/* * Scale MDCT coefficients from float to 24-bit fixed-point. */ static void scale_coefficients(AC3EncodeContext *s) diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 9dec9ae9cf..0b23b964ac 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -40,8 +40,6 @@ static void scale_coefficients(AC3EncodeContext *s); -static int normalize_samples(AC3EncodeContext *s); - static void clip_coefficients(AudioDSPContext *adsp, CoefType *coef, unsigned int len); @@ -113,10 +111,10 @@ static void apply_mdct(AC3EncodeContext *s) #else s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples, s->mdct_window, AC3_WINDOW_SIZE); -#endif if (s->fixed_point) block->coeff_shift[ch+1] = normalize_samples(s); +#endif s->mdct.mdct_calcw(&s->mdct, block->mdct_coef[ch+1], s->windowed_samples); |