| Index: webrtc/modules/audio_coding/codecs/ilbc/cb_search.c
|
| diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_search.c b/webrtc/modules/audio_coding/codecs/ilbc/cb_search.c
|
| index 2a77f4f66595189190a0c690a603d56b1ed1d207..e596b3458397dfa775ccfe217b2d257e4a3d4cdb 100644
|
| --- a/webrtc/modules/audio_coding/codecs/ilbc/cb_search.c
|
| +++ b/webrtc/modules/audio_coding/codecs/ilbc/cb_search.c
|
| @@ -149,7 +149,8 @@ void WebRtcIlbcfix_CbSearch(
|
|
|
| /* Compute the CB vectors' energies for the second cb section (filtered cb) */
|
| WebRtcIlbcfix_CbMemEnergyAugmentation(interpSamplesFilt, cbvectors,
|
| - scale, (int16_t)(base_size+20), energyW16, energyShifts);
|
| + scale, (int16_t)(base_size + 20),
|
| + energyW16, energyShifts);
|
|
|
| /* Compute the CB vectors' energies and store them in the vector
|
| * energyW16. Also the corresponding shift values are stored. The
|
| @@ -243,9 +244,12 @@ void WebRtcIlbcfix_CbSearch(
|
| if (lTarget==SUBL) {
|
| i=sInd;
|
| if (sInd<20) {
|
| - WebRtcIlbcfix_AugmentedCbCorr(target, cbvectors+lMem,
|
| + WebRtcIlbcfix_AugmentedCbCorr(target, cbvectors + lMem,
|
| interpSamplesFilt, cDot,
|
| - (int16_t)(sInd+20), (int16_t)(WEBRTC_SPL_MIN(39, (eInd+20))), scale);
|
| + (int16_t)(sInd + 20),
|
| + (int16_t)(WEBRTC_SPL_MIN(39,
|
| + (eInd + 20))),
|
| + scale);
|
| i=20;
|
| }
|
|
|
| @@ -253,14 +257,16 @@ void WebRtcIlbcfix_CbSearch(
|
| cb_vecPtr = cbvectors+lMem-20-i;
|
|
|
| /* Calculate the cross correlations (main part of the filtered CB) */
|
| - WebRtcSpl_CrossCorrelation(cDotPtr, target, cb_vecPtr, lTarget, (int16_t)(eInd-i+1), scale, -1);
|
| + WebRtcSpl_CrossCorrelation(cDotPtr, target, cb_vecPtr, lTarget,
|
| + (int16_t)(eInd - i + 1), scale, -1);
|
|
|
| } else {
|
| cDotPtr = cDot;
|
| cb_vecPtr = cbvectors+lMem-lTarget-sInd;
|
|
|
| /* Calculate the cross correlations (main part of the filtered CB) */
|
| - WebRtcSpl_CrossCorrelation(cDotPtr, target, cb_vecPtr, lTarget, (int16_t)(eInd-sInd+1), scale, -1);
|
| + WebRtcSpl_CrossCorrelation(cDotPtr, target, cb_vecPtr, lTarget,
|
| + (int16_t)(eInd - sInd + 1), scale, -1);
|
|
|
| }
|
|
|
| @@ -335,7 +341,8 @@ void WebRtcIlbcfix_CbSearch(
|
| /* Subtract the best codebook vector, according
|
| to measure, from the target vector */
|
|
|
| - WebRtcSpl_AddAffineVectorToVector(target, pp, (int16_t)(-bestGain), (int32_t)8192, (int16_t)14, (int)lTarget);
|
| + WebRtcSpl_AddAffineVectorToVector(target, pp, (int16_t)(-bestGain),
|
| + (int32_t)8192, (int16_t)14, (int)lTarget);
|
|
|
| /* record quantized gain */
|
| gains[stage+1] = bestGain;
|
|
|