diff options
Diffstat (limited to 'codecs/mp3')
-rwxr-xr-x | codecs/mp3/include/mhead.h | 5 | ||||
-rwxr-xr-x | codecs/mp3/src/cupL1.c | 2 | ||||
-rwxr-xr-x | codecs/mp3/src/cupini.c | 4 | ||||
-rwxr-xr-x | codecs/mp3/src/cupl3.c | 6 | ||||
-rwxr-xr-x | codecs/mp3/src/icdct.c | 2 | ||||
-rwxr-xr-x | codecs/mp3/src/isbt.c | 13 | ||||
-rwxr-xr-x | codecs/mp3/src/iup.c | 4 | ||||
-rwxr-xr-x | codecs/mp3/src/iupini.c | 2 | ||||
-rwxr-xr-x | codecs/mp3/src/iwinm.c | 2 | ||||
-rwxr-xr-x | codecs/mp3/src/l3init.c | 6 | ||||
-rwxr-xr-x | codecs/mp3/src/mdct.c | 4 |
11 files changed, 23 insertions, 27 deletions
diff --git a/codecs/mp3/include/mhead.h b/codecs/mp3/include/mhead.h index 06b43efb1..37791d909 100755 --- a/codecs/mp3/include/mhead.h +++ b/codecs/mp3/include/mhead.h @@ -210,9 +210,8 @@ MPEG8; #include "itype.h" typedef void (*SBT_FUNCTION) (SAMPLEINT * sample, short *pcm, int n); -typedef void (*UNPACK_FUNCTION) (); -typedef struct +typedef struct MPEGI { struct { DEC_INFO decinfo; @@ -241,7 +240,7 @@ typedef struct signed short group9_table[1024][3]; int nsbt; SBT_FUNCTION sbt; - UNPACK_FUNCTION unpack_routine; + void (*unpack_routine) (struct MPEGI *); unsigned char *bs_ptr; UINT32 bitbuf; int bits; diff --git a/codecs/mp3/src/cupL1.c b/codecs/mp3/src/cupL1.c index 84b46d24d..3ffe16801 100755 --- a/codecs/mp3/src/cupL1.c +++ b/codecs/mp3/src/cupL1.c @@ -312,7 +312,7 @@ int L1audio_decode_init(MPEG *m, MPEG_HEAD * h, int framebytes_arg, /* init sub-band transform */ - sbt_init(); + sbt_init(m); return 1; } diff --git a/codecs/mp3/src/cupini.c b/codecs/mp3/src/cupini.c index afa19d575..f92d06284 100755 --- a/codecs/mp3/src/cupini.c +++ b/codecs/mp3/src/cupini.c @@ -189,7 +189,7 @@ static int out_chans[5] = int audio_decode_initL1(MPEG_HEAD * h, int framebytes_arg, int reduction_code, int transform_code, int convert_code, int freq_limit); -void sbt_init(); +void sbt_init(MPEG *m); IN_OUT L1audio_decode(void *mv, unsigned char *bs, signed short *pcm); @@ -404,7 +404,7 @@ int audio_decode_init(MPEG *m, MPEG_HEAD * h, int framebytes_arg, /* init sub-band transform */ - sbt_init(); + sbt_init(m); return 1; } diff --git a/codecs/mp3/src/cupl3.c b/codecs/mp3/src/cupl3.c index 7d387b65d..59ec37c7d 100755 --- a/codecs/mp3/src/cupl3.c +++ b/codecs/mp3/src/cupl3.c @@ -104,7 +104,7 @@ static void bitget_init_end(unsigned char *buf_end) bitdat.bs_ptr_end = buf_end; } /*------------- get n bits from bitstream -------------*/ -int bitget_bits_used() +int bitget_bits_used(void) { int n; /* compute bits used from last init call */ @@ -142,7 +142,7 @@ unsigned int bitget(int n) return x; } /*------------- get 1 bit from bitstream -------------*/ -unsigned int bitget_1bit() +unsigned int bitget_1bit(void) { unsigned int x; @@ -994,8 +994,6 @@ void sbt_init(MPEG *m); #if 0 typedef int iARRAY22[22]; #endif -iARRAY22 *quant_init_band_addr(); -iARRAY22 *msis_init_band_addr(); /*---------------------------------------------------------*/ /* mpeg_head defined in mhead.h frame bytes is without pad */ diff --git a/codecs/mp3/src/icdct.c b/codecs/mp3/src/icdct.c index a38c401dd..c2e30971f 100755 --- a/codecs/mp3/src/icdct.c +++ b/codecs/mp3/src/icdct.c @@ -49,7 +49,7 @@ static DCTCOEF coef32[32]; /* 32 pt dct coefs */ #define forward_bf idx_forward_bf /*--- #define forward_bf ptr_forward_bf ---*/ /*------------------------------------------------------------*/ -DCTCOEF *i_dct_coef_addr() +DCTCOEF *i_dct_coef_addr(void) { return coef32; } diff --git a/codecs/mp3/src/isbt.c b/codecs/mp3/src/isbt.c index bc240bdb9..7bd456653 100755 --- a/codecs/mp3/src/isbt.c +++ b/codecs/mp3/src/isbt.c @@ -100,10 +100,10 @@ static signed int vb_ptr; extern WININT vbuf[512]; extern WININT vbuf2[512]; -DCTCOEF *i_dct_coef_addr(); +DCTCOEF *i_dct_coef_addr(void); /*======================================================================*/ -static void gencoef() /* gen coef for N=32 */ +static void gencoef(void) /* gen coef for N=32 */ { int p, n, i, k; double t, pi; @@ -125,8 +125,8 @@ static void gencoef() /* gen coef for N=32 */ } } /*------------------------------------------------------------*/ -WINCOEF *i_wincoef_addr(); -static void genwincoef_q() /* gen int window coefs from floating table */ +WINCOEF *i_wincoef_addr(void); +static void genwincoef_q(void) /* gen int window coefs from floating table */ { int i, j, k, m; float x; @@ -166,12 +166,11 @@ static void genwincoef_q() /* gen int window coefs from floating table */ } } /*------------------------------------------------------------*/ -static void genwincoef() /* gen int window coefs from floating table */ +static void genwincoef(void) /* gen int window coefs from floating table */ { int i; float x; WINCOEF *iwincoef; - WINCOEF *i_wincoef_addr(); iwincoef = i_wincoef_addr(); @@ -186,7 +185,7 @@ static void genwincoef() /* gen int window coefs from floating table */ } } /*------------------------------------------------------------*/ -void i_sbt_init() +void i_sbt_init(void) { int i; static int first_pass = 1; diff --git a/codecs/mp3/src/iup.c b/codecs/mp3/src/iup.c index 8dd2fcc79..1fdd41b65 100755 --- a/codecs/mp3/src/iup.c +++ b/codecs/mp3/src/iup.c @@ -138,7 +138,7 @@ static int bat_bit_master[] = void i_sbt_mono(SAMPLEINT * sample, short *pcm, int n); void i_sbt_dual(SAMPLEINT * sample, short *pcm, int n); -static void unpack(); +static void unpack(MPEGI *m); /*------------- initialize bit getter -------------*/ static void load_init(MPEGI *m, unsigned char *buf) @@ -514,7 +514,7 @@ IN_OUT i_audio_decode(MPEGI *m, unsigned char *bs, signed short *pcm) if (sync != 0xFFF) return in_out; /* sync fail */ /*-----------*/ - m->iup.unpack_routine(); + m->iup.unpack_routine(m); m->iup.sbt(m->iup.sample, pcm, m->iup.nsbt); diff --git a/codecs/mp3/src/iupini.c b/codecs/mp3/src/iupini.c index 800103b56..616fd63d2 100755 --- a/codecs/mp3/src/iupini.c +++ b/codecs/mp3/src/iupini.c @@ -268,7 +268,7 @@ static void table_init(MPEGI *m) int i_audio_decode_initL1(MPEGI *m, MPEG_HEAD * h, int framebytes_arg, int reduction_code, int transform_code, int convert_code, int freq_limit); -void i_sbt_init(); +void i_sbt_init(void); /*---------------------------------------------------------*/ /* mpeg_head defined in mhead.h frame bytes is without pad */ diff --git a/codecs/mp3/src/iwinm.c b/codecs/mp3/src/iwinm.c index 6bd12b627..11cfef33a 100755 --- a/codecs/mp3/src/iwinm.c +++ b/codecs/mp3/src/iwinm.c @@ -49,7 +49,7 @@ WININT vbuf2[512]; static WINCOEF iwincoef[264]; /*==================================================================*/ -WINCOEF *i_wincoef_addr() +WINCOEF *i_wincoef_addr(void) { return iwincoef; } diff --git a/codecs/mp3/src/l3init.c b/codecs/mp3/src/l3init.c index c3e724b3d..290d4e317 100755 --- a/codecs/mp3/src/l3init.c +++ b/codecs/mp3/src/l3init.c @@ -140,7 +140,7 @@ int L3table_init(MPEG *m) } /*====================================================================*/ typedef float ARRAY36[36]; -ARRAY36 *hwin_init_addr(); +ARRAY36 *hwin_init_addr(MPEG *m); /*--------------------------------------------------------------------*/ void hwin_init(MPEG *m) @@ -200,8 +200,8 @@ void hwin_init(MPEG *m) } /*=============================================================*/ typedef float ARRAY4[4]; -IMDCT_INIT_BLOCK *imdct_init_addr_18(); -IMDCT_INIT_BLOCK *imdct_init_addr_6(); +IMDCT_INIT_BLOCK *imdct_init_addr_18(void); +IMDCT_INIT_BLOCK *imdct_init_addr_6(void); /*-------------------------------------------------------------*/ void imdct_init(MPEG *m) diff --git a/codecs/mp3/src/mdct.c b/codecs/mp3/src/mdct.c index 7e95317ef..fa1b92416 100755 --- a/codecs/mp3/src/mdct.c +++ b/codecs/mp3/src/mdct.c @@ -71,11 +71,11 @@ static IMDCT_INIT_BLOCK imdct_info_6 = {mdct6_3v, mdct6_3v2, &coef87}; /*====================================================================*/ -IMDCT_INIT_BLOCK *imdct_init_addr_18() +IMDCT_INIT_BLOCK *imdct_init_addr_18(void) { return &imdct_info_18; } -IMDCT_INIT_BLOCK *imdct_init_addr_6() +IMDCT_INIT_BLOCK *imdct_init_addr_6(void) { return &imdct_info_6; } |