comparison mpegaudiodec.c @ 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 7a463923ecd1
children c5349ca95c08
comparison
equal deleted inserted replaced
8591:d1e300c41ed5 8592:9aac5b3cecbd
31 /* 31 /*
32 * TODO: 32 * TODO:
33 * - in low precision mode, use more 16 bit multiplies in synth filter 33 * - in low precision mode, use more 16 bit multiplies in synth filter
34 * - test lsf / mpeg25 extensively. 34 * - test lsf / mpeg25 extensively.
35 */ 35 */
36
37 /* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg
38 audio decoder */
39 #if CONFIG_MPEGAUDIO_HP
40 # define USE_HIGHPRECISION
41 #endif
42 36
43 #include "mpegaudio.h" 37 #include "mpegaudio.h"
44 #include "mpegaudiodecheader.h" 38 #include "mpegaudiodecheader.h"
45 39
46 #include "mathops.h" 40 #include "mathops.h"
320 static int init=0; 314 static int init=0;
321 int i, j, k; 315 int i, j, k;
322 316
323 s->avctx = avctx; 317 s->avctx = avctx;
324 318
325 #if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) 319 #if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT)
326 avctx->sample_fmt= SAMPLE_FMT_S32; 320 avctx->sample_fmt= SAMPLE_FMT_S32;
327 #else 321 #else
328 avctx->sample_fmt= SAMPLE_FMT_S16; 322 avctx->sample_fmt= SAMPLE_FMT_S16;
329 #endif 323 #endif
330 s->error_recognition= avctx->error_recognition; 324 s->error_recognition= avctx->error_recognition;