diff --git a/webrtc/common_audio/vad/vad_filterbank.c b/webrtc/common_audio/vad/vad_filterbank.c index f965ff722..33d3d049e 100644 --- a/webrtc/common_audio/vad/vad_filterbank.c +++ b/webrtc/common_audio/vad/vad_filterbank.c @@ -56,15 +56,15 @@ static void HighPassFilter(const int16_t* data_in, int data_length, 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]; diff --git a/webrtc/common_audio/vad/vad_gmm.c b/webrtc/common_audio/vad/vad_gmm.c index 593cf6260..23d4699d4 100644 --- a/webrtc/common_audio/vad/vad_gmm.c +++ b/webrtc/common_audio/vad/vad_gmm.c @@ -79,5 +79,5 @@ int32_t WebRtcVad_GaussianProbability(int16_t input, // 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; } diff --git a/webrtc/common_audio/vad/vad_sp.c b/webrtc/common_audio/vad/vad_sp.c index e981ad23e..fbd4f2ea2 100644 --- a/webrtc/common_audio/vad/vad_sp.c +++ b/webrtc/common_audio/vad/vad_sp.c @@ -170,8 +170,8 @@ int16_t WebRtcVad_FindMinimum(VadInstT* self, 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);