From 4ff125c703209747753d3debe43ba98cdfee34ed Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Thu, 14 Oct 2004 05:45:34 +0000
Subject: [PATCH] Fix iLBC compiler warnings
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4002 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
codecs/ilbc/FrameClassify.c | 1 +
codecs/ilbc/LPCdecode.c | 1 +
codecs/ilbc/LPCencode.c | 9 +++++----
codecs/ilbc/StateConstructW.c | 1 +
codecs/ilbc/StateSearchW.c | 1 +
codecs/ilbc/anaFilter.c | 1 +
codecs/ilbc/createCB.c | 1 +
codecs/ilbc/doCPLC.c | 3 ++-
codecs/ilbc/enhancer.c | 15 ++++++++-------
codecs/ilbc/filter.c | 1 +
codecs/ilbc/gainquant.c | 1 +
codecs/ilbc/getCBvec.c | 1 +
codecs/ilbc/helpfun.c | 1 +
codecs/ilbc/hpInput.c | 1 +
codecs/ilbc/hpOutput.c | 2 +-
codecs/ilbc/iCBConstruct.c | 1 +
codecs/ilbc/iCBSearch.c | 7 +++++--
codecs/ilbc/iLBC_decode.c | 3 ++-
codecs/ilbc/iLBC_encode.c | 1 +
codecs/ilbc/lsf.c | 1 +
codecs/ilbc/packing.c | 1 +
codecs/ilbc/syntFilter.c | 1 +
22 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/codecs/ilbc/FrameClassify.c b/codecs/ilbc/FrameClassify.c
index 69e52902a7..c982fd667a 100755
--- a/codecs/ilbc/FrameClassify.c
+++ b/codecs/ilbc/FrameClassify.c
@@ -11,6 +11,7 @@
******************************************************************/
#include "iLBC_define.h"
+#include "FrameClassify.h"
/*---------------------------------------------------------------*
* Classification of subframes to localize start state
diff --git a/codecs/ilbc/LPCdecode.c b/codecs/ilbc/LPCdecode.c
index 680ebdfac0..f4bc9896d2 100755
--- a/codecs/ilbc/LPCdecode.c
+++ b/codecs/ilbc/LPCdecode.c
@@ -16,6 +16,7 @@
#include "helpfun.h"
#include "lsf.h"
#include "iLBC_define.h"
+#include "LPCdecode.h"
#include "constants.h"
/*---------------------------------------------------------------*
diff --git a/codecs/ilbc/LPCencode.c b/codecs/ilbc/LPCencode.c
index 920859a0e9..4d5fcff213 100755
--- a/codecs/ilbc/LPCencode.c
+++ b/codecs/ilbc/LPCencode.c
@@ -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 @@ void SimpleAnalysis(
* (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 @@ void LSFinterpolate2a_enc(
* 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 @@ void SimpleInterpolateLSF(
* lsf quantizer (subrutine to LPCencode)
*---------------------------------------------------------------*/
-void SimplelsfQ(
+static void SimplelsfQ(
float *lsfdeq, /* (o) dequantized lsf coefficients
(dimension FILTERORDER) */
int *index, /* (o) quantization index */
diff --git a/codecs/ilbc/StateConstructW.c b/codecs/ilbc/StateConstructW.c
index 75f5213282..e48fe035d4 100755
--- a/codecs/ilbc/StateConstructW.c
+++ b/codecs/ilbc/StateConstructW.c
@@ -16,6 +16,7 @@
#include <string.h>
#include "iLBC_define.h"
+#include "StateConstructW.h"
#include "constants.h"
#include "filter.h"
diff --git a/codecs/ilbc/StateSearchW.c b/codecs/ilbc/StateSearchW.c
index d4ca73472f..b87b9f3c60 100755
--- a/codecs/ilbc/StateSearchW.c
+++ b/codecs/ilbc/StateSearchW.c
@@ -14,6 +14,7 @@
#include <string.h>
#include "iLBC_define.h"
+#include "StateSearchW.h"
#include "constants.h"
#include "filter.h"
#include "helpfun.h"
diff --git a/codecs/ilbc/anaFilter.c b/codecs/ilbc/anaFilter.c
index 1c9e718891..f88fefaa08 100755
--- a/codecs/ilbc/anaFilter.c
+++ b/codecs/ilbc/anaFilter.c
@@ -11,6 +11,7 @@
******************************************************************/
#include <string.h>
+#include "anaFilter.h"
#include "iLBC_define.h"
/*----------------------------------------------------------------*
diff --git a/codecs/ilbc/createCB.c b/codecs/ilbc/createCB.c
index b3b0c2b0f0..a7efd93801 100755
--- a/codecs/ilbc/createCB.c
+++ b/codecs/ilbc/createCB.c
@@ -13,6 +13,7 @@
******************************************************************/
#include "iLBC_define.h"
+#include "createCB.h"
#include "constants.h"
#include <string.h>
#include <math.h>
diff --git a/codecs/ilbc/doCPLC.c b/codecs/ilbc/doCPLC.c
index 559c64344d..bb4b56c108 100755
--- a/codecs/ilbc/doCPLC.c
+++ b/codecs/ilbc/doCPLC.c
@@ -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,
diff --git a/codecs/ilbc/enhancer.c b/codecs/ilbc/enhancer.c
index 3e381ec317..7c78298028 100755
--- a/codecs/ilbc/enhancer.c
+++ b/codecs/ilbc/enhancer.c
@@ -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 @@ void NearestNeighbor(
* 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 mycorr1(
-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 @@ void enh_upsample(
* 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 @@ void refiner(
* 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 @@ void smath(
* 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 @@ void getsseq(
* 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 */
diff --git a/codecs/ilbc/filter.c b/codecs/ilbc/filter.c
index 0afb52fa93..f4ba63386d 100755
--- a/codecs/ilbc/filter.c
+++ b/codecs/ilbc/filter.c
@@ -13,6 +13,7 @@
#include "iLBC_define.h"
+#include "filter.h"
/*----------------------------------------------------------------*
* all-pole filter
diff --git a/codecs/ilbc/gainquant.c b/codecs/ilbc/gainquant.c
index a23ce05b45..33dc194744 100755
--- a/codecs/ilbc/gainquant.c
+++ b/codecs/ilbc/gainquant.c
@@ -15,6 +15,7 @@
#include <string.h>
#include <math.h>
#include "constants.h"
+#include "gainquant.h"
#include "filter.h"
/*----------------------------------------------------------------*
diff --git a/codecs/ilbc/getCBvec.c b/codecs/ilbc/getCBvec.c
index 3d301dc40b..081abb2164 100755
--- a/codecs/ilbc/getCBvec.c
+++ b/codecs/ilbc/getCBvec.c
@@ -11,6 +11,7 @@
******************************************************************/
#include "iLBC_define.h"
+#include "getCBvec.h"
#include "constants.h"
#include <string.h>
diff --git a/codecs/ilbc/helpfun.c b/codecs/ilbc/helpfun.c
index ed8be50240..02d83c9717 100755
--- a/codecs/ilbc/helpfun.c
+++ b/codecs/ilbc/helpfun.c
@@ -13,6 +13,7 @@
#include <math.h>
#include "iLBC_define.h"
+#include "helpfun.h"
#include "constants.h"
/*----------------------------------------------------------------*
diff --git a/codecs/ilbc/hpInput.c b/codecs/ilbc/hpInput.c
index 4097c62052..16b98f3df9 100755
--- a/codecs/ilbc/hpInput.c
+++ b/codecs/ilbc/hpInput.c
@@ -11,6 +11,7 @@
******************************************************************/
#include "constants.h"
+#include "hpInput.h"
/*----------------------------------------------------------------*
* Input high-pass filter
diff --git a/codecs/ilbc/hpOutput.c b/codecs/ilbc/hpOutput.c
index 7d0eea010f..fdc0f6db92 100755
--- a/codecs/ilbc/hpOutput.c
+++ b/codecs/ilbc/hpOutput.c
@@ -13,7 +13,7 @@
******************************************************************/
#include "constants.h"
-
+#include "hpOutput.h"
/*----------------------------------------------------------------*
* Output high-pass filter
*---------------------------------------------------------------*/
diff --git a/codecs/ilbc/iCBConstruct.c b/codecs/ilbc/iCBConstruct.c
index 384e75df64..dbee586c25 100755
--- a/codecs/ilbc/iCBConstruct.c
+++ b/codecs/ilbc/iCBConstruct.c
@@ -13,6 +13,7 @@
#include <math.h>
#include "iLBC_define.h"
+#include "iCBConstruct.h"
#include "gainquant.h"
#include "getCBvec.h"
diff --git a/codecs/ilbc/iCBSearch.c b/codecs/ilbc/iCBSearch.c
index fbdeaf6b24..c047297e3d 100755
--- a/codecs/ilbc/iCBSearch.c
+++ b/codecs/ilbc/iCBSearch.c
@@ -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 @@ void iCBSearch(
*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 @@ void iCBSearch(
pp=cbvectors+lMem-lTarget;
for (j=0; j<lTarget; j++) {
- *ppe+=(*pp)*(*pp++);
+ *ppe+=(*pp)*(*pp);
+ pp++;
}
ppi = cbvectors + lMem - 1 - lTarget;
diff --git a/codecs/ilbc/iLBC_decode.c b/codecs/ilbc/iLBC_decode.c
index ace6fd90fe..91c80c8e22 100755
--- a/codecs/ilbc/iLBC_decode.c
+++ b/codecs/ilbc/iLBC_decode.c
@@ -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 @@ short initDecode( /* (o) Number of decoded
* 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 */
diff --git a/codecs/ilbc/iLBC_encode.c b/codecs/ilbc/iLBC_encode.c
index ceccc119fe..e2090626e2 100755
--- a/codecs/ilbc/iLBC_encode.c
+++ b/codecs/ilbc/iLBC_encode.c
@@ -15,6 +15,7 @@
#include <string.h>
#include "iLBC_define.h"
+#include "iLBC_encode.h"
#include "LPCencode.h"
#include "FrameClassify.h"
#include "StateSearchW.h"
diff --git a/codecs/ilbc/lsf.c b/codecs/ilbc/lsf.c
index 348ffe3931..055c21cb56 100755
--- a/codecs/ilbc/lsf.c
+++ b/codecs/ilbc/lsf.c
@@ -14,6 +14,7 @@
#include <math.h>
#include "iLBC_define.h"
+#include "lsf.h"
/*----------------------------------------------------------------*
* conversion from lpc coefficients to lsf coefficients
diff --git a/codecs/ilbc/packing.c b/codecs/ilbc/packing.c
index 4496ee9bca..3071032e09 100755
--- a/codecs/ilbc/packing.c
+++ b/codecs/ilbc/packing.c
@@ -16,6 +16,7 @@
#include "iLBC_define.h"
#include "constants.h"
#include "helpfun.h"
+#include "packing.h"
#include "string.h"
/*----------------------------------------------------------------*
diff --git a/codecs/ilbc/syntFilter.c b/codecs/ilbc/syntFilter.c
index 8621850d01..bb7f7a5599 100755
--- a/codecs/ilbc/syntFilter.c
+++ b/codecs/ilbc/syntFilter.c
@@ -11,6 +11,7 @@
******************************************************************/
#include "iLBC_define.h"
+#include "syntFilter.h"
/*----------------------------------------------------------------*
* LP synthesis filter.
--
GitLab