diff mpegaudiodec.c @ 2913:cc55bc1f8d92 libavcodec

QDM2 compatible decoder

--- a/mpegaudiodec.c	Sun Oct 16 13:56:52 2005 +0000
+++ b/mpegaudiodec.c	Tue Oct 18 20:16:43 2005 +0000
@@ -25,7 +25,6 @@
 //#define DEBUG
 #include "avcodec.h"
 #include "bitstream.h"
-#include "mpegaudio.h"
 #include "dsputil.h"
 
 /*
@@ -40,25 +39,7 @@
 #define USE_HIGHPRECISION
 #endif
 
-#ifdef USE_HIGHPRECISION
-#define FRAC_BITS   23   /* fractional bits for sb_samples and dct */
-#define WFRAC_BITS  16   /* fractional bits for window */
-#else
-#define FRAC_BITS   15   /* fractional bits for sb_samples and dct */
-#define WFRAC_BITS  14   /* fractional bits for window */
-#endif
-
-#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
-typedef int32_t OUT_INT;
-#define OUT_MAX INT32_MAX
-#define OUT_MIN INT32_MIN
-#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31)
-#else
-typedef int16_t OUT_INT;
-#define OUT_MAX INT16_MAX
-#define OUT_MIN INT16_MIN
-#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
-#endif
+#include "mpegaudio.h"
 
 #define FRAC_ONE    (1 << FRAC_BITS)
 
@@ -75,12 +56,6 @@
     return ((int64_t)(a) * (int64_t)(b))>>32;
 }
 
-#if FRAC_BITS <= 15
-typedef int16_t MPA_INT;
-#else
-typedef int32_t MPA_INT;
-#endif
-
 /****************/
 
 #define HEADER_SIZE 4