[Asterisk-cvs] asterisk/codecs/ilbc FrameClassify.c, 1.3, 1.4 LPCdecode.c, 1.3, 1.4 LPCencode.c, 1.4, 1.5 StateConstructW.c, 1.3, 1.4 StateSearchW.c, 1.3, 1.4 anaFilter.c, 1.3, 1.4 createCB.c, 1.3, 1.4 doCPLC.c, 1.3, 1.4 enhancer.c, 1.3, 1.4 filter.c, 1.3, 1.4 gainquant.c, 1.3, 1.4 getCBvec.c, 1.3, 1.4 helpfun.c, 1.4, 1.5 hpInput.c, 1.3, 1.4 hpOutput.c, 1.3, 1.4 iCBConstruct.c, 1.3, 1.4 iCBSearch.c, 1.5, 1.6 iLBC_decode.c, 1.3, 1.4 iLBC_encode.c, 1.3, 1.4 lsf.c, 1.3, 1.4 packing.c, 1.3, 1.4 syntFilter.c, 1.3, 1.4

markster at lists.digium.com markster at lists.digium.com
Thu Oct 14 01:45:10 CDT 2004 

Update of /usr/cvsroot/asterisk/codecs/ilbc
In directory mongoose.digium.com:/tmp/cvs-serv10019/codecs/ilbc

Modified Files:
	FrameClassify.c LPCdecode.c LPCencode.c StateConstructW.c 
	StateSearchW.c anaFilter.c createCB.c doCPLC.c enhancer.c 
	filter.c gainquant.c getCBvec.c helpfun.c hpInput.c hpOutput.c 
	iCBConstruct.c iCBSearch.c iLBC_decode.c iLBC_encode.c lsf.c 
	packing.c syntFilter.c 
Log Message:
Fix iLBC compiler warnings


Index: FrameClassify.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/FrameClassify.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FrameClassify.c	14 Oct 2004 05:15:48 -0000	1.3
+++ FrameClassify.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -11,6 +11,7 @@
 ******************************************************************/
 
 #include "iLBC_define.h"
+#include "FrameClassify.h"
 
 /*---------------------------------------------------------------*
  *  Classification of subframes to localize start state

Index: LPCdecode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/LPCdecode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LPCdecode.c	14 Oct 2004 05:15:48 -0000	1.3
+++ LPCdecode.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -16,6 +16,7 @@
 #include "helpfun.h"
 #include "lsf.h"
 #include "iLBC_define.h"
+#include "LPCdecode.h"
 #include "constants.h"
 
 /*---------------------------------------------------------------*

Index: LPCencode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/LPCencode.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- LPCencode.c	14 Oct 2004 05:15:48 -0000	1.4
+++ LPCencode.c	14 Oct 2004 05:45:34 -0000	1.5
@@ -15,6 +15,7 @@
 
 
 #include "iLBC_define.h"
+#include "LPCencode.h"
 #include "helpfun.h"
 #include "lsf.h"
 #include "constants.h"
@@ -23,7 +24,7 @@
  *  lpc analysis (subrutine to LPCencode)
  *---------------------------------------------------------------*/
 
-void SimpleAnalysis(
+static void SimpleAnalysis(
     float *lsf,         /* (o) lsf coefficients */
     float *data,    /* (i) new data vector */
     iLBC_Enc_Inst_t *iLBCenc_inst 
@@ -73,7 +74,7 @@
  *  (subrutine to SimpleInterpolateLSF)
  *---------------------------------------------------------------*/
 
-void LSFinterpolate2a_enc(
+static void LSFinterpolate2a_enc(
     float *a,       /* (o) lpc coefficients */ 
     float *lsf1,/* (i) first set of lsf coefficients */
     float *lsf2,/* (i) second set of lsf coefficients */
@@ -91,7 +92,7 @@
  *  lsf interpolator (subrutine to LPCencode)
  *---------------------------------------------------------------*/
 
-void SimpleInterpolateLSF(
+static void SimpleInterpolateLSF(
     float *syntdenum,   /* (o) the synthesis filter denominator 
                                resulting from the quantized 
                                interpolated lsf */
@@ -174,7 +175,7 @@
  *  lsf quantizer (subrutine to LPCencode)
  *---------------------------------------------------------------*/
 
-void SimplelsfQ(
+static void SimplelsfQ(
     float *lsfdeq,    /* (o) dequantized lsf coefficients
                            (dimension FILTERORDER) */
     int *index,     /* (o) quantization index */

Index: StateConstructW.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/StateConstructW.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StateConstructW.c	14 Oct 2004 05:15:48 -0000	1.3
+++ StateConstructW.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -16,6 +16,7 @@
 #include <string.h>
 
 #include "iLBC_define.h"
+#include "StateConstructW.h"
 #include "constants.h"
 #include "filter.h"
 

Index: StateSearchW.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/StateSearchW.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StateSearchW.c	14 Oct 2004 05:15:48 -0000	1.3
+++ StateSearchW.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "iLBC_define.h"
+#include "StateSearchW.h"
 #include "constants.h"
 #include "filter.h"
 #include "helpfun.h"

Index: anaFilter.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/anaFilter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- anaFilter.c	14 Oct 2004 05:15:48 -0000	1.3
+++ anaFilter.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -11,6 +11,7 @@
 ******************************************************************/
 
 #include <string.h>
+#include "anaFilter.h"
 #include "iLBC_define.h"
 
 /*----------------------------------------------------------------*

Index: createCB.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/createCB.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- createCB.c	14 Oct 2004 05:15:48 -0000	1.3
+++ createCB.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -13,6 +13,7 @@
 ******************************************************************/
 
 #include "iLBC_define.h"
+#include "createCB.h"
 #include "constants.h"
 #include <string.h>
 #include <math.h>

Index: doCPLC.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/doCPLC.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- doCPLC.c	14 Oct 2004 05:15:48 -0000	1.3
+++ doCPLC.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -15,13 +15,14 @@
 #include <stdio.h>
 
 #include "iLBC_define.h"
+#include "doCPLC.h"
 
 /*----------------------------------------------------------------*
  *  Compute cross correlation and pitch gain for pitch prediction
  *  of last subframe at given lag.
  *---------------------------------------------------------------*/
 
-void compCorr(
+static void compCorr(
     float *cc,      /* (o) cross correlation coefficient */
     float *gc,      /* (o) gain */
     float *pm,

Index: enhancer.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/enhancer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- enhancer.c	14 Oct 2004 05:15:48 -0000	1.3
+++ enhancer.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -13,6 +13,7 @@
 #include <math.h>
 #include <string.h>
 #include "iLBC_define.h"
+#include "enhancer.h"
 #include "constants.h"
 #include "filter.h"
 
@@ -24,7 +25,7 @@
  * according to the squared-error criterion
  *---------------------------------------------------------------*/
 
-void NearestNeighbor(
+static void NearestNeighbor(
     int   *index,   /* (o) index of array element closest 
                            to value */
     float *array,   /* (i) data array */
@@ -52,7 +53,7 @@
  * compute cross correlation between sequences
  *---------------------------------------------------------------*/
 
-void mycorr1( 
+static void mycorr1( 
     float* corr,    /* (o) correlation of seq1 and seq2 */
     float* seq1,    /* (i) first sequence */
     int dim1,           /* (i) dimension first seq1 */
@@ -75,7 +76,7 @@
 
 
 
-void enh_upsample( 
+static void enh_upsample( 
     float* useq1,   /* (o) upsampled output sequence */
     float* seq1,/* (i) unupsampled sequence */
     int dim1,       /* (i) dimension seq1 */
@@ -160,7 +161,7 @@
  * sampling rate
  *---------------------------------------------------------------*/
 
-void refiner(
+static void refiner(
     float *seg,         /* (o) segment array */
     float *updStartPos, /* (o) updated start point */
     float* idata,       /* (i) original data buffer */
@@ -250,7 +251,7 @@
  * find the smoothed output data
  *---------------------------------------------------------------*/
 
-void smath(
+static void smath(
     float *odata,   /* (o) smoothed output */
     float *sseq,/* (i) said second sequence of waveforms */
     int hl,         /* (i) 2*hl+1 is sseq dimension */
@@ -347,7 +348,7 @@
  * get the pitch-synchronous sample sequence
  *---------------------------------------------------------------*/
 
-void getsseq(
+static void getsseq(
     float *sseq,    /* (o) the pitch-synchronous sequence */
     float *idata,       /* (i) original data */
     int idatal,         /* (i) dimension of data */
@@ -425,7 +426,7 @@
  * idata+centerStartPos+ENH_BLOCKL-1
  *---------------------------------------------------------------*/
 
-void enhancer(
+static void enhancer(
     float *odata,       /* (o) smoothed block, dimension blockl */
     float *idata,       /* (i) data buffer used for enhancing */
     int idatal,         /* (i) dimension idata */

Index: filter.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/filter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- filter.c	14 Oct 2004 05:15:48 -0000	1.3
+++ filter.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -13,6 +13,7 @@
 
 
 #include "iLBC_define.h"
+#include "filter.h"
 
 /*----------------------------------------------------------------*
  *  all-pole filter

Index: gainquant.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/gainquant.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gainquant.c	14 Oct 2004 05:15:48 -0000	1.3
+++ gainquant.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <math.h>
 #include "constants.h"
+#include "gainquant.h"
 #include "filter.h"
 
 /*----------------------------------------------------------------*

Index: getCBvec.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/getCBvec.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- getCBvec.c	14 Oct 2004 05:15:48 -0000	1.3
+++ getCBvec.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -11,6 +11,7 @@
 ******************************************************************/
 
 #include "iLBC_define.h"
+#include "getCBvec.h"
 #include "constants.h"
 #include <string.h>
 

Index: helpfun.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/helpfun.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- helpfun.c	14 Oct 2004 05:15:48 -0000	1.4
+++ helpfun.c	14 Oct 2004 05:45:34 -0000	1.5
@@ -13,6 +13,7 @@
 #include <math.h>
 
 #include "iLBC_define.h"
+#include "helpfun.h"
 #include "constants.h"
 
 /*----------------------------------------------------------------*

Index: hpInput.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/hpInput.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hpInput.c	14 Oct 2004 05:15:48 -0000	1.3
+++ hpInput.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -11,6 +11,7 @@
 ******************************************************************/
 
 #include "constants.h"
+#include "hpInput.h"
 
 /*----------------------------------------------------------------*
  *  Input high-pass filter                          

Index: hpOutput.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/hpOutput.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hpOutput.c	14 Oct 2004 05:15:48 -0000	1.3
+++ hpOutput.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -13,7 +13,7 @@
 ******************************************************************/
 
 #include "constants.h"
-
+#include "hpOutput.h"
 /*----------------------------------------------------------------*
  *  Output high-pass filter                          
  *---------------------------------------------------------------*/

Index: iCBConstruct.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/iCBConstruct.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iCBConstruct.c	14 Oct 2004 05:15:48 -0000	1.3
+++ iCBConstruct.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -13,6 +13,7 @@
 #include <math.h>
 
 #include "iLBC_define.h"
+#include "iCBConstruct.h"
 #include "gainquant.h"
 #include "getCBvec.h"
 

Index: iCBSearch.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/iCBSearch.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- iCBSearch.c	14 Oct 2004 05:15:48 -0000	1.5
+++ iCBSearch.c	14 Oct 2004 05:45:34 -0000	1.6
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "iLBC_define.h"
+#include "iCBSearch.h"
 #include "gainquant.h"
 #include "createCB.h"
 #include "filter.h"
@@ -121,7 +122,8 @@
             *ppe=0.0;
             pp=buf+LPC_FILTERORDER+lMem-lTarget;
             for (j=0; j<lTarget; j++) {
-                *ppe+=(*pp)*(*pp++);
+                *ppe+=(*pp)*(*pp);
+				pp++;
             }
             
             if (*ppe>0.0) {
@@ -303,7 +305,8 @@
 
             pp=cbvectors+lMem-lTarget;
             for (j=0; j<lTarget; j++) {
-                *ppe+=(*pp)*(*pp++);
+                *ppe+=(*pp)*(*pp);
+				pp++;
             }
 
             ppi = cbvectors + lMem - 1 - lTarget;

Index: iLBC_decode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/iLBC_decode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iLBC_decode.c	14 Oct 2004 05:15:48 -0000	1.3
+++ iLBC_decode.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 
 #include "iLBC_define.h"
+#include "iLBC_decode.h"
 #include "StateConstructW.h"
 #include "LPCdecode.h"
 #include "iCBConstruct.h"
@@ -110,7 +111,7 @@
  *  frame residual decoder function (subrutine to iLBC_decode) 
  *---------------------------------------------------------------*/
 
-void Decode(
+static void Decode(
     iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state 
                                              structure */
     float *decresidual,             /* (o) decoded residual frame */

Index: iLBC_encode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/iLBC_encode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iLBC_encode.c	14 Oct 2004 05:15:48 -0000	1.3
+++ iLBC_encode.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -15,6 +15,7 @@
 #include <string.h>
 
 #include "iLBC_define.h"
+#include "iLBC_encode.h"
 #include "LPCencode.h"
 #include "FrameClassify.h"
 #include "StateSearchW.h"

Index: lsf.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/lsf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lsf.c	14 Oct 2004 05:15:48 -0000	1.3
+++ lsf.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -14,6 +14,7 @@
 #include <math.h>
 
 #include "iLBC_define.h"
+#include "lsf.h"
 
 /*----------------------------------------------------------------*
  *  conversion from lpc coefficients to lsf coefficients 

Index: packing.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/packing.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- packing.c	14 Oct 2004 05:15:48 -0000	1.3
+++ packing.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -16,6 +16,7 @@
 #include "iLBC_define.h"
 #include "constants.h"
 #include "helpfun.h"
+#include "packing.h"
 #include "string.h"
 
 /*----------------------------------------------------------------*

Index: syntFilter.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/syntFilter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- syntFilter.c	14 Oct 2004 05:15:48 -0000	1.3
+++ syntFilter.c	14 Oct 2004 05:45:34 -0000	1.4
@@ -11,6 +11,7 @@
 ******************************************************************/
 
 #include "iLBC_define.h"
+#include "syntFilter.h"
 
 /*----------------------------------------------------------------*
  *  LP synthesis filter.

More information about the svn-commits mailing list