diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-06-16 22:58:43 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-06-16 22:58:43 +0000 |
| commit | c2d08dc0d78e85e6a45abb33e587b8a66a2de754 (patch) | |
| tree | 20cea5fcc8aa1f191fcb3206819aedc35fecd0b6 | |
| parent | 41e4c556e93156cab184e5af9b246a4cf07c54ab (diff) | |
move a couple of macros and structs to mpegaudio.h
Originally committed as revision 9343 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegaudio.h | 11 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 10 | ||||
| -rw-r--r-- | libavcodec/mpegaudioenc.c | 1 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 8a830e25a9..d0461526ba 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -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 @@ typedef struct MPADecodeContext { 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); diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 9e8472f561..f2eb84108f 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -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 @@ typedef struct GranuleDef { #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" diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index d0506c6b70..ede44927c2 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -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 |