Mercurial > libavcodec.hg
comparison mpegaudio.h @ 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 | 2b0d01be134f |
children | c5349ca95c08 |
comparison
equal
deleted
inserted
replaced
8591:d1e300c41ed5 | 8592:9aac5b3cecbd |
---|---|
49 #define SAME_HEADER_MASK \ | 49 #define SAME_HEADER_MASK \ |
50 (0xffe00000 | (3 << 17) | (0xf << 12) | (3 << 10) | (3 << 19)) | 50 (0xffe00000 | (3 << 17) | (0xf << 12) | (3 << 10) | (3 << 19)) |
51 | 51 |
52 #define MP3_MASK 0xFFFE0CCF | 52 #define MP3_MASK 0xFFFE0CCF |
53 | 53 |
54 /* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg | 54 #ifdef CONFIG_MPEGAUDIO_HP |
55 audio decoder */ | |
56 | |
57 #ifdef USE_HIGHPRECISION | |
58 #define FRAC_BITS 23 /* fractional bits for sb_samples and dct */ | 55 #define FRAC_BITS 23 /* fractional bits for sb_samples and dct */ |
59 #define WFRAC_BITS 16 /* fractional bits for window */ | 56 #define WFRAC_BITS 16 /* fractional bits for window */ |
60 #else | 57 #else |
61 #define FRAC_BITS 15 /* fractional bits for sb_samples and dct */ | 58 #define FRAC_BITS 15 /* fractional bits for sb_samples and dct */ |
62 #define WFRAC_BITS 14 /* fractional bits for window */ | 59 #define WFRAC_BITS 14 /* fractional bits for window */ |
64 | 61 |
65 #define FRAC_ONE (1 << FRAC_BITS) | 62 #define FRAC_ONE (1 << FRAC_BITS) |
66 | 63 |
67 #define FIX(a) ((int)((a) * FRAC_ONE)) | 64 #define FIX(a) ((int)((a) * FRAC_ONE)) |
68 | 65 |
69 #if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) | 66 #if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT) |
70 typedef int32_t OUT_INT; | 67 typedef int32_t OUT_INT; |
71 #define OUT_MAX INT32_MAX | 68 #define OUT_MAX INT32_MAX |
72 #define OUT_MIN INT32_MIN | 69 #define OUT_MIN INT32_MIN |
73 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31) | 70 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31) |
74 #else | 71 #else |