Last fixes to build with gcc 4.6.

Set but unused parameter/variable warnings.
http://code.google.com/p/webrtc/issues/detail?id=52
Review URL: http://webrtc-codereview.appspot.com/139006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@498 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2011-08-31 18:50:12 +00:00
parent cdefd423bd
commit 9562a3664c
6 changed files with 4 additions and 22 deletions

View File

@@ -240,8 +240,8 @@ WebRtc_Word16 WebRtcIlbcfix_DecodePlc(iLBC_decinst_t *iLBCdec_inst, WebRtc_Word1
WebRtc_Word16 WebRtcIlbcfix_NetEqPlc(iLBC_decinst_t *iLBCdec_inst, WebRtc_Word16 *decoded, WebRtc_Word16 noOfLostFrames) {
/* Two input parameters not used, but needed for function pointers in NetEQ */
decoded = NULL;
noOfLostFrames = 0;
(void)(decoded = NULL);
(void)(noOfLostFrames = 0);
WebRtcSpl_MemSetW16(((iLBC_Dec_Inst_t*)iLBCdec_inst)->enh_buf, 0, ENH_BUFL);
((iLBC_Dec_Inst_t*)iLBCdec_inst)->prev_enh_pl = 2;

View File

@@ -153,8 +153,6 @@ WebRtc_Word16 WebRtcIsac_UpdateBandwidthEstimator(
float arr_time_noise;
float arr_time_noise_abs;
WebRtc_Word32 asdf;
float delay_correction_factor = 1;
float late_diff = 0.0f;
int immediate_set = 0;
@@ -471,8 +469,6 @@ WebRtc_Word16 WebRtcIsac_UpdateBandwidthEstimator(
bwest_str->prev_rec_arr_ts = arr_ts ;
bwest_str->prev_rec_send_ts = send_ts;
asdf = bwest_str->rec_bw;
/* Replace bwest_str->rec_bw by the new value (atomic operation) */
bwest_str->rec_bw = (WebRtc_Word32)(1.0f / bwest_str->rec_bw_inv -
bwest_str->rec_header_rate);

View File

@@ -865,8 +865,6 @@ WebRtcIsac_EncodeUb12(
WebRtc_Word16 fre[FRAMESAMPLES_HALF]; /* Q7 */
WebRtc_Word16 fim[FRAMESAMPLES_HALF]; /* Q7 */
WebRtc_Word16 AvgPitchGain_Q12;
int status = 0;
double varscale[1];
@@ -927,8 +925,6 @@ WebRtcIsac_EncodeUb12(
WebRtcIsac_SplitAndFilterFloat(ISACencUB_obj->data_buffer_float, HP, LP,
HP_lookahead, LP_lookahead, &ISACencUB_obj->prefiltbankstr_obj);
AvgPitchGain_Q12 = 0;
/* find coefficients for perceptual pre-filters */
WebRtcIsac_GetLpcCoefUb(LP_lookahead, &ISACencUB_obj->maskfiltstr_obj,
lpcVecs, corr, varscale, isac12kHz);

View File

@@ -1849,7 +1849,6 @@ void WebRtcIsac_EncodeLpcGainLb(double *LPCCoef_lo, double *LPCCoef_hi, int mode
int j, k, n, pos, pos2, posg, offsg, offs2;
int index_g[KLT_ORDER_GAIN];
int index_ovr_g[KLT_ORDER_GAIN];
double Bits;
double tmpcoeffs_g[KLT_ORDER_GAIN];
double tmpcoeffs2_g[KLT_ORDER_GAIN];
double sum;
@@ -1907,7 +1906,6 @@ void WebRtcIsac_EncodeLpcGainLb(double *LPCCoef_lo, double *LPCCoef_hi, int mode
/* quantize coefficients */
Bits = 0.0;
for (k=0; k<KLT_ORDER_GAIN; k++) {
/* get index */
@@ -2523,7 +2521,6 @@ void WebRtcIsac_TranscodeLPCCoef(double *LPCCoef_lo, double *LPCCoef_hi, int mod
int j, k, n, pos, pos2, posg, offsg, offs2;
int index_ovr_g[KLT_ORDER_GAIN];
double Bits;
double tmpcoeffs_g[KLT_ORDER_GAIN];
double tmpcoeffs2_g[KLT_ORDER_GAIN];
double sum;
@@ -2581,7 +2578,6 @@ void WebRtcIsac_TranscodeLPCCoef(double *LPCCoef_lo, double *LPCCoef_hi, int mod
/* quantize coefficients */
Bits = 0.0;
for (k=0; k<KLT_ORDER_GAIN; k++) {
/* get index */

View File

@@ -136,7 +136,7 @@ WebRtcIsac_GetVarsUB(
double* oldEnergy,
double* varscale)
{
double nrg[4], chng, pg;
double nrg[4], chng;
int k;
/* Calculate energies of first and second frame halfs */
@@ -164,9 +164,6 @@ WebRtcIsac_GetVarsUB(
fabs(10.0 * log10(nrg[0] / *oldEnergy)));
/* Find average pitch gain */
pg = 0.0;
/* If pitch gain is low and energy constant - increase noise level*/
/* Matlab code:
pg = 0:.01:.45; plot(pg, 0.0 + 1.0 * exp( -1.0 * exp(-200.0 * pg.*pg.*pg) / (1.0 + 0.4 * 0) ))
@@ -464,7 +461,6 @@ WebRtcIsac_GetLpcGain(
const double* varscale)
{
WebRtc_Word16 j, n;
WebRtc_Word16 varscaleIdx;
WebRtc_Word16 subFrameCntr;
double aPolynom[ORDERLO + 1];
double res_nrg;
@@ -475,7 +471,6 @@ WebRtcIsac_GetLpcGain(
const double S_N_R = pow(10.0, 0.05 * signal_noise_ratio) / 3.46;
aPolynom[0] = 1;
varscaleIdx = 0;
for(subFrameCntr = 0; subFrameCntr < numVecs; subFrameCntr++)
{
if(subFrameCntr == SUBFRAMES)