ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function
authorDiego Biurrun <diego@biurrun.de>
Mon, 4 Jan 2016 10:50:22 +0000 (11:50 +0100)
committerDiego Biurrun <diego@biurrun.de>
Mon, 28 Nov 2016 16:19:30 +0000 (17:19 +0100)
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3enc_template.c

index 2bb82ef..c26f9c0 100644 (file)
@@ -38,6 +38,8 @@
 static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
                                       ac3_options, LIBAVUTIL_VERSION_INT };
 
+static int normalize_samples(AC3EncodeContext *s);
+
 #include "ac3enc_template.c"
 
 
index 968cb2c..5bae4bc 100644 (file)
@@ -83,16 +83,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)
index ec8ec4e..eefcef5 100644 (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);
 
@@ -110,10 +108,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);