[FFmpeg-cvslog] r16594 - in trunk/libavcodec: mpc.c mpc7.c mpc8.c mpegaudio.h mpegaudiodec.c qdm2.c

[diego]

Author: diego
Date: Wed Jan 14 01:48:17 2009
New Revision: 16594

Log:
Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.

Modified:
   trunk/libavcodec/mpc.c
   trunk/libavcodec/mpc7.c
   trunk/libavcodec/mpc8.c
   trunk/libavcodec/mpegaudio.h
   trunk/libavcodec/mpegaudiodec.c
   trunk/libavcodec/qdm2.c

Modified: trunk/libavcodec/mpc.c
==============================================================================
--- trunk/libavcodec/mpc.c	Wed Jan 14 01:45:04 2009	(r16593)
+++ trunk/libavcodec/mpc.c	Wed Jan 14 01:48:17 2009	(r16594)
@@ -29,10 +29,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-
-#if CONFIG_MPEGAUDIO_HP
-#define USE_HIGHPRECISION
-#endif
 #include "mpegaudio.h"
 
 #include "mpc.h"

Modified: trunk/libavcodec/mpc7.c
==============================================================================
--- trunk/libavcodec/mpc7.c	Wed Jan 14 01:45:04 2009	(r16593)
+++ trunk/libavcodec/mpc7.c	Wed Jan 14 01:48:17 2009	(r16594)
@@ -29,10 +29,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-
-#if CONFIG_MPEGAUDIO_HP
-#define USE_HIGHPRECISION
-#endif
 #include "mpegaudio.h"
 
 #include "mpc.h"

Modified: trunk/libavcodec/mpc8.c
==============================================================================
--- trunk/libavcodec/mpc8.c	Wed Jan 14 01:45:04 2009	(r16593)
+++ trunk/libavcodec/mpc8.c	Wed Jan 14 01:48:17 2009	(r16594)
@@ -29,10 +29,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-
-#if CONFIG_MPEGAUDIO_HP
-#define USE_HIGHPRECISION
-#endif
 #include "mpegaudio.h"
 
 #include "mpc.h"

Modified: trunk/libavcodec/mpegaudio.h
==============================================================================
--- trunk/libavcodec/mpegaudio.h	Wed Jan 14 01:45:04 2009	(r16593)
+++ trunk/libavcodec/mpegaudio.h	Wed Jan 14 01:48:17 2009	(r16594)
@@ -51,10 +51,7 @@
 
 #define MP3_MASK 0xFFFE0CCF
 
-/* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg
-   audio decoder */
-
-#ifdef USE_HIGHPRECISION
+#ifdef CONFIG_MPEGAUDIO_HP
 #define FRAC_BITS   23   /* fractional bits for sb_samples and dct */
 #define WFRAC_BITS  16   /* fractional bits for window */
 #else
@@ -66,7 +63,7 @@
 
 #define FIX(a)   ((int)((a) * FRAC_ONE))
 
-#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
+#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT)
 typedef int32_t OUT_INT;
 #define OUT_MAX INT32_MAX
 #define OUT_MIN INT32_MIN

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	Wed Jan 14 01:45:04 2009	(r16593)
+++ trunk/libavcodec/mpegaudiodec.c	Wed Jan 14 01:48:17 2009	(r16594)
@@ -34,12 +34,6 @@
  *  - test lsf / mpeg25 extensively.
  */
 
-/* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg
-   audio decoder */
-#if CONFIG_MPEGAUDIO_HP
-#   define USE_HIGHPRECISION
-#endif
-
 #include "mpegaudio.h"
 #include "mpegaudiodecheader.h"
 
@@ -322,7 +316,7 @@ static int decode_init(AVCodecContext * 
 
     s->avctx = avctx;
 
-#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
+#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT)
     avctx->sample_fmt= SAMPLE_FMT_S32;
 #else
     avctx->sample_fmt= SAMPLE_FMT_S16;

Modified: trunk/libavcodec/qdm2.c
==============================================================================
--- trunk/libavcodec/qdm2.c	Wed Jan 14 01:45:04 2009	(r16593)
+++ trunk/libavcodec/qdm2.c	Wed Jan 14 01:48:17 2009	(r16594)
@@ -38,11 +38,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-
-#if CONFIG_MPEGAUDIO_HP
-#define USE_HIGHPRECISION
-#endif
-
 #include "mpegaudio.h"
 
 #include "qdm2data.h"