Mercurial > libavcodec.hg
changeset 5161:94c3f01c243c libavcodec
move a couple of macros and structs to mpegaudio.h
| author | mru |
|---|---|
| date | Sat, 16 Jun 2007 22:58:43 +0000 |
| parents | 13386224ff72 |
| children | 4394344397d8 |
| files | mpegaudio.h mpegaudiodec.c mpegaudioenc.c |
| diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegaudio.h Sat Jun 16 19:54:04 2007 +0000 +++ b/mpegaudio.h Sat Jun 16 22:58:43 2007 +0000 @@ -62,6 +62,10 @@ #define WFRAC_BITS 14 /* fractional bits for window */ #endif +#define FRAC_ONE (1 << FRAC_BITS) + +#define FIX(a) ((int)((a) * FRAC_ONE)) + #if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) typedef int32_t OUT_INT; #define OUT_MAX INT32_MAX @@ -116,6 +120,13 @@ AVCodecContext* avctx; } MPADecodeContext; +/* layer 3 huffman tables */ +typedef struct HuffTable { + int xsize; + const uint8_t *bits; + const uint16_t *codes; +} HuffTable; + int ff_mpa_l2_select_table(int bitrate, int nb_channels, int freq, int lsf); int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate); void ff_mpa_synth_init(MPA_INT *window);
--- a/mpegaudiodec.c Sat Jun 16 19:54:04 2007 +0000 +++ b/mpegaudiodec.c Sat Jun 16 22:58:43 2007 +0000 @@ -46,9 +46,6 @@ #include "mathops.h" -#define FRAC_ONE (1 << FRAC_BITS) - -#define FIX(a) ((int)((a) * FRAC_ONE)) /* WARNING: only correct for posititive numbers */ #define FIXR(a) ((int)((a) * FRAC_ONE + 0.5)) #define FRAC_RND(a) (((a) + (FRAC_ONE/2)) >> FRAC_BITS) @@ -91,13 +88,6 @@ #define MODE_EXT_MS_STEREO 2 #define MODE_EXT_I_STEREO 1 -/* layer 3 huffman tables */ -typedef struct HuffTable { - int xsize; - const uint8_t *bits; - const uint16_t *codes; -} HuffTable; - #include "mpegaudiodata.h" #include "mpegaudiodectab.h"
--- a/mpegaudioenc.c Sat Jun 16 19:54:04 2007 +0000 +++ b/mpegaudioenc.c Sat Jun 16 22:58:43 2007 +0000 @@ -31,7 +31,6 @@ /* currently, cannot change these constants (need to modify quantization stage) */ #define MUL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS) -#define FIX(a) ((int)((a) * (1 << FRAC_BITS))) #define SAMPLES_BUF_SIZE 4096