commit d25c0340516339718fa06f72ca41d93c7870cac8
author bjornv@webrtc.org <bjornv@webrtc.org> Mon Jan 26 15:32:47 2015 +0000
committer bjornv@webrtc.org <bjornv@webrtc.org> Mon Jan 26 15:32:47 2015 +0000
tree 489d82b5ba464e0c49b318971e496ea1fd8912ea
parent 04cd466bd5a05702f1f760fe9a2f4d81b2baed26

Refactor common_audio/vad: Removed usage of macro WEBRTC_SPL_MUL_16_16()

BUG=3348,3353
TESTED=Locally on Mac and trybots
R=kwiberg@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8152 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/common_audio/vad/vad_filterbank.c

diff --git a/webrtc/common_audio/vad/vad_filterbank.c b/webrtc/common_audio/vad/vad_filterbank.c
index f965ff7..33d3d04 100644
--- a/webrtc/common_audio/vad/vad_filterbank.c
+++ b/webrtc/common_audio/vad/vad_filterbank.c
@@ -56,15 +56,15 @@
 
   for (i = 0; i < data_length; i++) {
     // All-zero section (filter coefficients in Q14).
-    tmp32 = WEBRTC_SPL_MUL_16_16(kHpZeroCoefs[0], *in_ptr);
-    tmp32 += WEBRTC_SPL_MUL_16_16(kHpZeroCoefs[1], filter_state[0]);
-    tmp32 += WEBRTC_SPL_MUL_16_16(kHpZeroCoefs[2], filter_state[1]);
+    tmp32 = kHpZeroCoefs[0] * *in_ptr;
+    tmp32 += kHpZeroCoefs[1] * filter_state[0];
+    tmp32 += kHpZeroCoefs[2] * filter_state[1];
     filter_state[1] = filter_state[0];
     filter_state[0] = *in_ptr++;
 
     // All-pole section (filter coefficients in Q14).
-    tmp32 -= WEBRTC_SPL_MUL_16_16(kHpPoleCoefs[1], filter_state[2]);
-    tmp32 -= WEBRTC_SPL_MUL_16_16(kHpPoleCoefs[2], filter_state[3]);
+    tmp32 -= kHpPoleCoefs[1] * filter_state[2];
+    tmp32 -= kHpPoleCoefs[2] * filter_state[3];
     filter_state[3] = filter_state[2];
     filter_state[2] = (int16_t) (tmp32 >> 14);
     *out_ptr++ = filter_state[2];

webrtc/common_audio/vad/vad_gmm.c

diff --git a/webrtc/common_audio/vad/vad_gmm.c b/webrtc/common_audio/vad/vad_gmm.c
index 593cf62..23d4699 100644
--- a/webrtc/common_audio/vad/vad_gmm.c
+++ b/webrtc/common_audio/vad/vad_gmm.c
@@ -79,5 +79,5 @@
 
   // Calculate and return (1 / s) * exp(-(x - m)^2 / (2 * s^2)), in Q20.
   // Q-domain: Q10 * Q10 = Q20.
-  return WEBRTC_SPL_MUL_16_16(inv_std, exp_value);
+  return inv_std * exp_value;
 }

webrtc/common_audio/vad/vad_sp.c

diff --git a/webrtc/common_audio/vad/vad_sp.c b/webrtc/common_audio/vad/vad_sp.c
index e981ad2..fbd4f2e 100644
--- a/webrtc/common_audio/vad/vad_sp.c
+++ b/webrtc/common_audio/vad/vad_sp.c
@@ -170,8 +170,8 @@
       alpha = kSmoothingUp;  // 0.99 in Q15.
     }
   }
-  tmp32 = WEBRTC_SPL_MUL_16_16(alpha + 1, self->mean_value[channel]);
-  tmp32 += WEBRTC_SPL_MUL_16_16(WEBRTC_SPL_WORD16_MAX - alpha, current_median);
+  tmp32 = (alpha + 1) * self->mean_value[channel];
+  tmp32 += (WEBRTC_SPL_WORD16_MAX - alpha) * current_median;
   tmp32 += 16384;
   self->mean_value[channel] = (int16_t) (tmp32 >> 15);