zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio_coding/codecs/ilbc: Replaced macro WEBRTC_SPL_RSHIFT_W32 with >>

Browse Source 
Removed usage of trivial macro.

BUG=3348,3353
TESTED=locally on linux and trybots
R=henrik.lundin@webrtc.org, kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/29789004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7480 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org
2014-10-21 07:17:24 +00:00
parent 913f7b8d5e
commit 78ea06dd34
21 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/modules/audio_coding/codecs/ilbc/smooth.c
View File

@ -101,7 +101,7 @@ void WebRtcIlbcfix_Smooth(
} else {
/* crit = 0.05 * w00 (Result in Q-6) */
crit = WEBRTC_SPL_SHIFT_W32(
WEBRTC_SPL_MUL(ENH_A0, WEBRTC_SPL_RSHIFT_W32(w00prim, 14)),
WEBRTC_SPL_MUL(ENH_A0, w00prim >> 14),
-(6-scale+scale1));
}
@ -139,7 +139,7 @@ void WebRtcIlbcfix_Smooth(
endiff = (w11w00-w10w10);
endiff = WEBRTC_SPL_MAX(0, endiff);
/* denom is in Q16 */
denom = WebRtcSpl_DivW32W16(endiff, (int16_t)WEBRTC_SPL_RSHIFT_W32(w00w00, 16));
denom = WebRtcSpl_DivW32W16(endiff, (int16_t)(w00w00 >> 16));
} else {
denom = 65536;
}
@ -151,10 +151,10 @@ void WebRtcIlbcfix_Smooth(
if (scale>0) {
/* denomW16 is in Q(16+scale) */
denomW16=(int16_t)WEBRTC_SPL_RSHIFT_W32(denom, scale);
denomW16 = (int16_t)(denom >> scale);
/* num in Q(34-scale) */
num=WEBRTC_SPL_RSHIFT_W32(ENH_A0_MINUS_A0A0DIV4, scale);
num = ENH_A0_MINUS_A0A0DIV4 >> scale;
} else {
/* denomW16 is in Q16 */
denomW16=(int16_t)denom;
@ -174,8 +174,8 @@ void WebRtcIlbcfix_Smooth(
scale = bitsw00-scale2-15;
if (scale>0) {
w10prim=WEBRTC_SPL_RSHIFT_W32(w10prim, scale);
w00prim=WEBRTC_SPL_RSHIFT_W32(w00prim, scale);
w10prim >>= scale;
w00prim >>= scale;
}
if ((w00prim>0)&&(w10prim>0)) {
@ -187,7 +187,7 @@ void WebRtcIlbcfix_Smooth(
B_W32 = (int32_t)1073741824 - (int32_t)ENH_A0DIV2 -
WEBRTC_SPL_MUL(A, w11_div_w00);
}
B = (int16_t)WEBRTC_SPL_RSHIFT_W32(B_W32, 16); /* B in Q14 */
B = (int16_t)(B_W32 >> 16); /* B in Q14. */
} else {
/* No smoothing */
A = 0;