Mercurial > libavcodec.hg
changeset 8592:9aac5b3cecbd libavcodec
Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.
| author | diego |
|---|---|
| date | Wed, 14 Jan 2009 00:48:17 +0000 |
| parents | d1e300c41ed5 |
| children | 7de1d00618e4 |
| files | mpc.c mpc7.c mpc8.c mpegaudio.h mpegaudiodec.c qdm2.c |
| diffstat | 6 files changed, 3 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/mpc.c Wed Jan 14 00:27:43 2009 +0000 +++ b/mpc.c Wed Jan 14 00:48:17 2009 +0000 @@ -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"
--- a/mpc7.c Wed Jan 14 00:27:43 2009 +0000 +++ b/mpc7.c Wed Jan 14 00:48:17 2009 +0000 @@ -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"
--- a/mpc8.c Wed Jan 14 00:27:43 2009 +0000 +++ b/mpc8.c Wed Jan 14 00:48:17 2009 +0000 @@ -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"
--- a/mpegaudio.h Wed Jan 14 00:27:43 2009 +0000 +++ b/mpegaudio.h Wed Jan 14 00:48:17 2009 +0000 @@ -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
--- a/mpegaudiodec.c Wed Jan 14 00:27:43 2009 +0000 +++ b/mpegaudiodec.c Wed Jan 14 00:48:17 2009 +0000 @@ -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 @@ 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;