RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move a couple of macros and structs to mpegaudio.h 

Originally committed as revision 9343 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2007-06-16 22:58:43 +00:00
parent 41e4c556e9
commit c2d08dc0d7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpegaudio.h
View File

@ -62,6 +62,10 @@
#define WFRAC_BITS 14 /* fractional bits for window */ #define WFRAC_BITS 14 /* fractional bits for window */
#endif #endif
#define FRAC_ONE (1 << FRAC_BITS)
#define FIX(a) ((int)((a) * FRAC_ONE))
#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) #if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
typedef int32_t OUT_INT; typedef int32_t OUT_INT;
#define OUT_MAX INT32_MAX #define OUT_MAX INT32_MAX
@ -116,6 +120,13 @@ typedef struct MPADecodeContext {
AVCodecContext* avctx; AVCodecContext* avctx;
} MPADecodeContext; } 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_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); int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate);
void ff_mpa_synth_init(MPA_INT *window); void ff_mpa_synth_init(MPA_INT *window);

10
libavcodec/mpegaudiodec.c
View File

@ -46,9 +46,6 @@
#include "mathops.h" #include "mathops.h"
#define FRAC_ONE (1 << FRAC_BITS)
#define FIX(a) ((int)((a) * FRAC_ONE))
/* WARNING: only correct for posititive numbers */ /* WARNING: only correct for posititive numbers */
#define FIXR(a) ((int)((a) * FRAC_ONE + 0.5)) #define FIXR(a) ((int)((a) * FRAC_ONE + 0.5))
#define FRAC_RND(a) (((a) + (FRAC_ONE/2)) >> FRAC_BITS) #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_MS_STEREO 2
#define MODE_EXT_I_STEREO 1 #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 "mpegaudiodata.h"
#include "mpegaudiodectab.h" #include "mpegaudiodectab.h"

1
libavcodec/mpegaudioenc.c
View File

@ -31,7 +31,6 @@
/* currently, cannot change these constants (need to modify /* currently, cannot change these constants (need to modify
quantization stage) */ quantization stage) */
#define MUL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS) #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 #define SAMPLES_BUF_SIZE 4096