Commit ad1eebe3 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.

Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ddda628e
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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 * avctx)
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;
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment