[Asterisk-cvs] asterisk/codecs/mp3/src cupL1.c,1.1.1.1,1.2 cupini.c,1.1.1.1,1.2 cupl3.c,1.1.1.1,1.2 icdct.c,1.1.1.1,1.2 isbt.c,1.1.1.1,1.2 iup.c,1.1.1.1,1.2 iupini.c,1.1.1.1,1.2 iwinm.c,1.1.1.1,1.2 l3init.c,1.1.1.1,1.2 mdct.c,1.1.1.1,1.2
markster at lists.digium.com
markster at lists.digium.com
Thu Sep 18 20:19:14 CDT 2003
Update of /usr/cvsroot/asterisk/codecs/mp3/src
In directory mongoose.digium.com:/tmp/cvs-serv26315/codecs/mp3/src
Modified Files:
cupL1.c cupini.c cupl3.c icdct.c isbt.c iup.c iupini.c iwinm.c
l3init.c mdct.c
Log Message:
Code cleanups (bug #66)
Index: cupL1.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/cupL1.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cupL1.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ cupL1.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -312,7 +312,7 @@
/* init sub-band transform */
- sbt_init();
+ sbt_init(m);
return 1;
}
Index: cupini.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/cupini.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cupini.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ cupini.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -189,7 +189,7 @@
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 @@
/* init sub-band transform */
- sbt_init();
+ sbt_init(m);
return 1;
}
Index: cupl3.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/cupl3.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cupl3.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ cupl3.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -104,7 +104,7 @@
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 @@
return x;
}
/*------------- get 1 bit from bitstream -------------*/
-unsigned int bitget_1bit()
+unsigned int bitget_1bit(void)
{
unsigned int x;
@@ -994,8 +994,6 @@
#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 */
Index: icdct.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/icdct.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- icdct.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ icdct.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -49,7 +49,7 @@
#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;
}
Index: isbt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/isbt.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- isbt.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ isbt.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -100,10 +100,10 @@
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 @@
}
}
/*------------------------------------------------------------*/
-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() /* 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 @@
}
}
/*------------------------------------------------------------*/
-void i_sbt_init()
+void i_sbt_init(void)
{
int i;
static int first_pass = 1;
Index: iup.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/iup.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- iup.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ iup.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -138,7 +138,7 @@
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 @@
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);
Index: iupini.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/iupini.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- iupini.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ iupini.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -268,7 +268,7 @@
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 */
Index: iwinm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/iwinm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- iwinm.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ iwinm.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -49,7 +49,7 @@
static WINCOEF iwincoef[264];
/*==================================================================*/
-WINCOEF *i_wincoef_addr()
+WINCOEF *i_wincoef_addr(void)
{
return iwincoef;
}
Index: l3init.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/l3init.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- l3init.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ l3init.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -140,7 +140,7 @@
}
/*====================================================================*/
typedef float ARRAY36[36];
-ARRAY36 *hwin_init_addr();
+ARRAY36 *hwin_init_addr(MPEG *m);
/*--------------------------------------------------------------------*/
void hwin_init(MPEG *m)
@@ -200,8 +200,8 @@
}
/*=============================================================*/
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)
Index: mdct.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/mp3/src/mdct.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- mdct.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ mdct.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -71,11 +71,11 @@
{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;
}
More information about the svn-commits
mailing list