virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function

Browse Source
This commit is contained in:
Diego Biurrun 2016-01-04 11:50:22 +01:00
parent d30719e62d
commit e22c63ac74
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ac3enc_fixed.c
View File

@ -38,6 +38,8 @@
static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name, static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
ac3_options, LIBAVUTIL_VERSION_INT }; ac3_options, LIBAVUTIL_VERSION_INT };
static int normalize_samples(AC3EncodeContext *s);
#include "ac3enc_template.c" #include "ac3enc_template.c"

10
libavcodec/ac3enc_float.c
View File

@ -82,16 +82,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. * Scale MDCT coefficients from float to 24-bit fixed-point.
*/ */

4
libavcodec/ac3enc_template.c
View File

@ -40,8 +40,6 @@
static void scale_coefficients(AC3EncodeContext *s); static void scale_coefficients(AC3EncodeContext *s);
static int normalize_samples(AC3EncodeContext *s);
static void clip_coefficients(AudioDSPContext *adsp, CoefType *coef, static void clip_coefficients(AudioDSPContext *adsp, CoefType *coef,
unsigned int len); unsigned int len);
@ -110,10 +108,10 @@ static void apply_mdct(AC3EncodeContext *s)
#else #else
s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples, s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples,
s->mdct_window, AC3_WINDOW_SIZE); s->mdct_window, AC3_WINDOW_SIZE);
#endif
if (s->fixed_point) if (s->fixed_point)
block->coeff_shift[ch+1] = normalize_samples(s); block->coeff_shift[ch+1] = normalize_samples(s);
#endif
s->mdct.mdct_calcw(&s->mdct, block->mdct_coef[ch+1], s->mdct.mdct_calcw(&s->mdct, block->mdct_coef[ch+1],
s->windowed_samples); s->windowed_samples);