diff options
Diffstat (limited to 'webrtc/modules/audio_coding/codecs/ilbc')
6 files changed, 9 insertions, 9 deletions
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c b/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c index 1e978eb2bf..0778c27506 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/enhancer_interface.c @@ -100,7 +100,7 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */ enh_buf+ENH_BUFL-inLen, /* Input samples */ (int16_t)(inLen+ENH_BUFL_FILTEROVERHEAD), downsampled, - (int16_t)WEBRTC_SPL_RSHIFT_W16(inLen, 1), + (int16_t)(inLen / 2), (int16_t*)WebRtcIlbcfix_kLpFiltCoefs, /* Coefficients in Q12 */ FILTERORDER_DS_PLUS1, /* Length of filter (order-1) */ FACTOR_DS, @@ -292,7 +292,7 @@ int WebRtcIlbcfix_EnhancerInterface( /* (o) Estimated lag in end of in[] */ /* Calculate increase parameter for window part (16 last samples) */ /* (1-2*SqrtEnChange)/16 in Q15 */ - inc=(2048-WEBRTC_SPL_RSHIFT_W16(SqrtEnChange, 3)); + inc = 2048 - (SqrtEnChange >> 3); win=0; tmpW16ptr=&plc_pred[plc_blockl-16]; diff --git a/webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.c b/webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.c index ca07b0ae39..fb9b03d3ff 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/get_cd_vec.c @@ -41,7 +41,7 @@ void WebRtcIlbcfix_GetCbVec( base_size=lMem-cbveclen+1; if (cbveclen==SUBL) { - base_size+=WEBRTC_SPL_RSHIFT_W16(cbveclen,1); + base_size += cbveclen / 2; } /* No filter -> First codebook section */ @@ -60,7 +60,7 @@ void WebRtcIlbcfix_GetCbVec( k=(int16_t)WEBRTC_SPL_MUL_16_16(2, (index-(lMem-cbveclen+1)))+cbveclen; - lag=WEBRTC_SPL_RSHIFT_W16(k, 1); + lag = k / 2; WebRtcIlbcfix_CreateAugmentedVec(lag, mem+lMem, cbvec); diff --git a/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c b/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c index 40737bbeea..579fdcf7eb 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c @@ -43,7 +43,7 @@ void WebRtcIlbcfix_Lsf2Lsp( Lower 8 bits give the difference, which needs to be approximated linearly */ - k = WEBRTC_SPL_RSHIFT_W16(freq, 8); + k = freq >> 8; diff = (freq&0x00ff); /* Guard against getting outside table */ diff --git a/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.c b/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.c index 3add966ece..ce5de29a3a 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/poly_to_lsp.c @@ -91,7 +91,7 @@ void WebRtcIlbcfix_Poly2Lsp( /* Run 4 times to reduce the interval */ for (i = 0; i < 4; i++) { /* xmid =(xlow + xhigh)/2 */ - xmid = WEBRTC_SPL_RSHIFT_W16(xlow, 1) + WEBRTC_SPL_RSHIFT_W16(xhigh, 1); + xmid = (xlow >> 1) + (xhigh >> 1); ymid = WebRtcIlbcfix_Chebyshev(xmid, f[fi_select]); if (WEBRTC_SPL_MUL_16_16(ylow, ymid) <= 0) { diff --git a/webrtc/modules/audio_coding/codecs/ilbc/refiner.c b/webrtc/modules/audio_coding/codecs/ilbc/refiner.c index 50d30c9b81..fed3394812 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/refiner.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/refiner.c @@ -53,7 +53,7 @@ void WebRtcIlbcfix_Refiner( /* defining array bounds */ - estSegPosRounded=WEBRTC_SPL_RSHIFT_W16((estSegPos - 2),2); + estSegPosRounded = (estSegPos - 2) >> 2; searchSegStartPos=estSegPosRounded-ENH_SLOP; @@ -103,7 +103,7 @@ void WebRtcIlbcfix_Refiner( bounds */ *updStartPos = (int16_t)WEBRTC_SPL_MUL_16_16(searchSegStartPos,4) + tloc + 4; - tloc2 = WEBRTC_SPL_RSHIFT_W16((tloc+3), 2); + tloc2 = (tloc + 3) >> 2; st=searchSegStartPos+tloc2-ENH_FL0; diff --git a/webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.c b/webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.c index df3a3b7668..cf3b30ae1a 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.c +++ b/webrtc/modules/audio_coding/codecs/ilbc/smooth_out_data.c @@ -37,7 +37,7 @@ int32_t WebRtcIlbcfix_Smooth_odata( errs=0; for(i=0;i<80;i++) { - err=(int16_t)WEBRTC_SPL_RSHIFT_W16((psseq[i]-odata[i]), 3); + err = (psseq[i] - odata[i]) >> 3; errs+=WEBRTC_SPL_MUL_16_16(err, err); /* errs in Q-6 */ } |