Fix iLBC compiler warnings

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4002 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-10-14 05:45:34 +00:00
parent f84de658d4
commit 4ff125c703
22 changed files with 39 additions and 16 deletions

View File

@@ -11,6 +11,7 @@
******************************************************************/ ******************************************************************/
#include "iLBC_define.h" #include "iLBC_define.h"
#include "FrameClassify.h"
/*---------------------------------------------------------------* /*---------------------------------------------------------------*
* Classification of subframes to localize start state * Classification of subframes to localize start state

View File

@@ -16,6 +16,7 @@
#include "helpfun.h" #include "helpfun.h"
#include "lsf.h" #include "lsf.h"
#include "iLBC_define.h" #include "iLBC_define.h"
#include "LPCdecode.h"
#include "constants.h" #include "constants.h"
/*---------------------------------------------------------------* /*---------------------------------------------------------------*

View File

@@ -15,6 +15,7 @@
#include "iLBC_define.h" #include "iLBC_define.h"
#include "LPCencode.h"
#include "helpfun.h" #include "helpfun.h"
#include "lsf.h" #include "lsf.h"
#include "constants.h" #include "constants.h"
@@ -23,7 +24,7 @@
* lpc analysis (subrutine to LPCencode) * lpc analysis (subrutine to LPCencode)
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void SimpleAnalysis( static void SimpleAnalysis(
float *lsf, /* (o) lsf coefficients */ float *lsf, /* (o) lsf coefficients */
float *data, /* (i) new data vector */ float *data, /* (i) new data vector */
iLBC_Enc_Inst_t *iLBCenc_inst iLBC_Enc_Inst_t *iLBCenc_inst
@@ -73,7 +74,7 @@ void SimpleAnalysis(
* (subrutine to SimpleInterpolateLSF) * (subrutine to SimpleInterpolateLSF)
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void LSFinterpolate2a_enc( static void LSFinterpolate2a_enc(
float *a, /* (o) lpc coefficients */ float *a, /* (o) lpc coefficients */
float *lsf1,/* (i) first set of lsf coefficients */ float *lsf1,/* (i) first set of lsf coefficients */
float *lsf2,/* (i) second set of lsf coefficients */ float *lsf2,/* (i) second set of lsf coefficients */
@@ -91,7 +92,7 @@ void LSFinterpolate2a_enc(
* lsf interpolator (subrutine to LPCencode) * lsf interpolator (subrutine to LPCencode)
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void SimpleInterpolateLSF( static void SimpleInterpolateLSF(
float *syntdenum, /* (o) the synthesis filter denominator float *syntdenum, /* (o) the synthesis filter denominator
resulting from the quantized resulting from the quantized
interpolated lsf */ interpolated lsf */
@@ -174,7 +175,7 @@ void SimpleInterpolateLSF(
* lsf quantizer (subrutine to LPCencode) * lsf quantizer (subrutine to LPCencode)
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void SimplelsfQ( static void SimplelsfQ(
float *lsfdeq, /* (o) dequantized lsf coefficients float *lsfdeq, /* (o) dequantized lsf coefficients
(dimension FILTERORDER) */ (dimension FILTERORDER) */
int *index, /* (o) quantization index */ int *index, /* (o) quantization index */

View File

@@ -16,6 +16,7 @@
#include <string.h> #include <string.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "StateConstructW.h"
#include "constants.h" #include "constants.h"
#include "filter.h" #include "filter.h"

View File

@@ -14,6 +14,7 @@
#include <string.h> #include <string.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "StateSearchW.h"
#include "constants.h" #include "constants.h"
#include "filter.h" #include "filter.h"
#include "helpfun.h" #include "helpfun.h"

View File

@@ -11,6 +11,7 @@
******************************************************************/ ******************************************************************/
#include <string.h> #include <string.h>
#include "anaFilter.h"
#include "iLBC_define.h" #include "iLBC_define.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*

View File

@@ -13,6 +13,7 @@
******************************************************************/ ******************************************************************/
#include "iLBC_define.h" #include "iLBC_define.h"
#include "createCB.h"
#include "constants.h" #include "constants.h"
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>

View File

@@ -15,13 +15,14 @@
#include <stdio.h> #include <stdio.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "doCPLC.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*
* Compute cross correlation and pitch gain for pitch prediction * Compute cross correlation and pitch gain for pitch prediction
* of last subframe at given lag. * of last subframe at given lag.
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void compCorr( static void compCorr(
float *cc, /* (o) cross correlation coefficient */ float *cc, /* (o) cross correlation coefficient */
float *gc, /* (o) gain */ float *gc, /* (o) gain */
float *pm, float *pm,

View File

@@ -13,6 +13,7 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "enhancer.h"
#include "constants.h" #include "constants.h"
#include "filter.h" #include "filter.h"
@@ -24,7 +25,7 @@
* according to the squared-error criterion * according to the squared-error criterion
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void NearestNeighbor( static void NearestNeighbor(
int *index, /* (o) index of array element closest int *index, /* (o) index of array element closest
to value */ to value */
float *array, /* (i) data array */ float *array, /* (i) data array */
@@ -52,7 +53,7 @@ void NearestNeighbor(
* compute cross correlation between sequences * compute cross correlation between sequences
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void mycorr1( static void mycorr1(
float* corr, /* (o) correlation of seq1 and seq2 */ float* corr, /* (o) correlation of seq1 and seq2 */
float* seq1, /* (i) first sequence */ float* seq1, /* (i) first sequence */
int dim1, /* (i) dimension first seq1 */ int dim1, /* (i) dimension first seq1 */
@@ -75,7 +76,7 @@ void mycorr1(
void enh_upsample( static void enh_upsample(
float* useq1, /* (o) upsampled output sequence */ float* useq1, /* (o) upsampled output sequence */
float* seq1,/* (i) unupsampled sequence */ float* seq1,/* (i) unupsampled sequence */
int dim1, /* (i) dimension seq1 */ int dim1, /* (i) dimension seq1 */
@@ -160,7 +161,7 @@ void enh_upsample(
* sampling rate * sampling rate
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void refiner( static void refiner(
float *seg, /* (o) segment array */ float *seg, /* (o) segment array */
float *updStartPos, /* (o) updated start point */ float *updStartPos, /* (o) updated start point */
float* idata, /* (i) original data buffer */ float* idata, /* (i) original data buffer */
@@ -250,7 +251,7 @@ void refiner(
* find the smoothed output data * find the smoothed output data
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void smath( static void smath(
float *odata, /* (o) smoothed output */ float *odata, /* (o) smoothed output */
float *sseq,/* (i) said second sequence of waveforms */ float *sseq,/* (i) said second sequence of waveforms */
int hl, /* (i) 2*hl+1 is sseq dimension */ int hl, /* (i) 2*hl+1 is sseq dimension */
@@ -347,7 +348,7 @@ void smath(
* get the pitch-synchronous sample sequence * get the pitch-synchronous sample sequence
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void getsseq( static void getsseq(
float *sseq, /* (o) the pitch-synchronous sequence */ float *sseq, /* (o) the pitch-synchronous sequence */
float *idata, /* (i) original data */ float *idata, /* (i) original data */
int idatal, /* (i) dimension of data */ int idatal, /* (i) dimension of data */
@@ -425,7 +426,7 @@ void getsseq(
* idata+centerStartPos+ENH_BLOCKL-1 * idata+centerStartPos+ENH_BLOCKL-1
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void enhancer( static void enhancer(
float *odata, /* (o) smoothed block, dimension blockl */ float *odata, /* (o) smoothed block, dimension blockl */
float *idata, /* (i) data buffer used for enhancing */ float *idata, /* (i) data buffer used for enhancing */
int idatal, /* (i) dimension idata */ int idatal, /* (i) dimension idata */

View File

@@ -13,6 +13,7 @@
#include "iLBC_define.h" #include "iLBC_define.h"
#include "filter.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*
* all-pole filter * all-pole filter

View File

@@ -15,6 +15,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "constants.h" #include "constants.h"
#include "gainquant.h"
#include "filter.h" #include "filter.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*

View File

@@ -11,6 +11,7 @@
******************************************************************/ ******************************************************************/
#include "iLBC_define.h" #include "iLBC_define.h"
#include "getCBvec.h"
#include "constants.h" #include "constants.h"
#include <string.h> #include <string.h>

View File

@@ -13,6 +13,7 @@
#include <math.h> #include <math.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "helpfun.h"
#include "constants.h" #include "constants.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*

View File

@@ -11,6 +11,7 @@
******************************************************************/ ******************************************************************/
#include "constants.h" #include "constants.h"
#include "hpInput.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*
* Input high-pass filter * Input high-pass filter

View File

@@ -13,7 +13,7 @@
******************************************************************/ ******************************************************************/
#include "constants.h" #include "constants.h"
#include "hpOutput.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*
* Output high-pass filter * Output high-pass filter
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/

View File

@@ -13,6 +13,7 @@
#include <math.h> #include <math.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "iCBConstruct.h"
#include "gainquant.h" #include "gainquant.h"
#include "getCBvec.h" #include "getCBvec.h"

View File

@@ -14,6 +14,7 @@
#include <string.h> #include <string.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "iCBSearch.h"
#include "gainquant.h" #include "gainquant.h"
#include "createCB.h" #include "createCB.h"
#include "filter.h" #include "filter.h"
@@ -121,7 +122,8 @@ void iCBSearch(
*ppe=0.0; *ppe=0.0;
pp=buf+LPC_FILTERORDER+lMem-lTarget; pp=buf+LPC_FILTERORDER+lMem-lTarget;
for (j=0; j<lTarget; j++) { for (j=0; j<lTarget; j++) {
*ppe+=(*pp)*(*pp++); *ppe+=(*pp)*(*pp);
pp++;
} }
if (*ppe>0.0) { if (*ppe>0.0) {
@@ -303,7 +305,8 @@ void iCBSearch(
pp=cbvectors+lMem-lTarget; pp=cbvectors+lMem-lTarget;
for (j=0; j<lTarget; j++) { for (j=0; j<lTarget; j++) {
*ppe+=(*pp)*(*pp++); *ppe+=(*pp)*(*pp);
pp++;
} }
ppi = cbvectors + lMem - 1 - lTarget; ppi = cbvectors + lMem - 1 - lTarget;

View File

@@ -14,6 +14,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "iLBC_decode.h"
#include "StateConstructW.h" #include "StateConstructW.h"
#include "LPCdecode.h" #include "LPCdecode.h"
#include "iCBConstruct.h" #include "iCBConstruct.h"
@@ -110,7 +111,7 @@ short initDecode( /* (o) Number of decoded
* frame residual decoder function (subrutine to iLBC_decode) * frame residual decoder function (subrutine to iLBC_decode)
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void Decode( static void Decode(
iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state
structure */ structure */
float *decresidual, /* (o) decoded residual frame */ float *decresidual, /* (o) decoded residual frame */

View File

@@ -15,6 +15,7 @@
#include <string.h> #include <string.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "iLBC_encode.h"
#include "LPCencode.h" #include "LPCencode.h"
#include "FrameClassify.h" #include "FrameClassify.h"
#include "StateSearchW.h" #include "StateSearchW.h"

View File

@@ -14,6 +14,7 @@
#include <math.h> #include <math.h>
#include "iLBC_define.h" #include "iLBC_define.h"
#include "lsf.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*
* conversion from lpc coefficients to lsf coefficients * conversion from lpc coefficients to lsf coefficients

View File

@@ -16,6 +16,7 @@
#include "iLBC_define.h" #include "iLBC_define.h"
#include "constants.h" #include "constants.h"
#include "helpfun.h" #include "helpfun.h"
#include "packing.h"
#include "string.h" #include "string.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*

View File

@@ -11,6 +11,7 @@
******************************************************************/ ******************************************************************/
#include "iLBC_define.h" #include "iLBC_define.h"
#include "syntFilter.h"
/*----------------------------------------------------------------* /*----------------------------------------------------------------*
* LP synthesis filter. * LP synthesis filter.