diff options
| author | bjornv@webrtc.org <bjornv@webrtc.org> | 2014-10-08 15:36:30 +0000 |
|---|---|---|
| committer | bjornv@webrtc.org <bjornv@webrtc.org> | 2014-10-08 15:36:30 +0000 |
| commit | f71785cd3b282ad7d584d746ba5b19833a11692b (patch) | |
| tree | 39a341ee02798369224816bff3ec3f5035f5263c /webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c | |
| parent | 575d126a3d4a4bf6d43ea07189ac201f6bfe0798 (diff) | |
| download | webrtc-f71785cd3b282ad7d584d746ba5b19833a11692b.tar.gz | |
audio_coding: Replaced macro WEBRTC_SPL_RSHIFT_W16 with >>
Replaced trivial shift macro with >>. The actual implementation of the macro is simply >>.
Affected codecs:
* ilbc
* isac/fix
BUG=3348,3353
TESTED=locally on linux and trybots
R=henrik.lundin@webrtc.org, kwiberg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/23889004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7396 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c')
| -rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c index 27d1c1fc14..c1b4abb7cd 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c @@ -142,7 +142,7 @@ static int32_t CalcExpN(int16_t x) { if (x>=0) { // ax=(int16_t)WEBRTC_SPL_MUL_16_16_RSFT(x, 23637-700, 14); //Q8 ax=(int16_t)WEBRTC_SPL_MUL_16_16_RSFT(x, 23637, 14); //Q8 - axINT = WEBRTC_SPL_RSHIFT_W16(ax, 8); //Q0 + axINT = ax >> 8; //Q0 axFRAC = ax&0x00FF; exp16 = WEBRTC_SPL_LSHIFT_W32(1, axINT); //Q0 axFRAC = axFRAC+256; //Q8 @@ -152,7 +152,7 @@ static int32_t CalcExpN(int16_t x) { // ax=(int16_t)WEBRTC_SPL_MUL_16_16_RSFT(x, 23637+700, 14); //Q8 ax=(int16_t)WEBRTC_SPL_MUL_16_16_RSFT(x, 23637, 14); //Q8 ax = -ax; - axINT = 1 + WEBRTC_SPL_RSHIFT_W16(ax, 8); //Q0 + axINT = 1 + (ax >> 8); //Q0 axFRAC = 0x00FF - (ax&0x00FF); exp16 = (int16_t) WEBRTC_SPL_RSHIFT_W32(32768, axINT); //Q15 axFRAC = axFRAC+256; //Q8 @@ -339,7 +339,7 @@ static void CalcRootInvArSpec(const int16_t *ARCoefQ12, in_sqrt = summQ16[0] + WEBRTC_SPL_LSHIFT_W32(diffQ16[0], shftVal); /* convert to magnitude spectrum, by doing square-roots (modified from SPLIB) */ - res = WEBRTC_SPL_LSHIFT_W32(1, WEBRTC_SPL_RSHIFT_W16(WebRtcSpl_GetSizeInBits(in_sqrt), 1)); + res = 1 << (WebRtcSpl_GetSizeInBits(in_sqrt) >> 1); for (k = 0; k < FRAMESAMPLES/8; k++) { |