RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976' 

* commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976':
  ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-04-07 00:04:37 -03:00
parent bfb2e20737 e22c63ac74
commit c37e8c0b7f
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

@ -43,6 +43,8 @@ static const AVClass ac3enc_class = {
.version = LIBAVUTIL_VERSION_INT,
};
static int normalize_samples(AC3EncodeContext *s);
#include "ac3enc_template.c"

10
libavcodec/ac3enc_float.c
View File

@ -86,16 +86,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.
*/

4
libavcodec/ac3enc_template.c
View File

@ -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);