diff options
| author | bjornv@webrtc.org <bjornv@webrtc.org> | 2014-10-13 14:00:43 +0000 |
|---|---|---|
| committer | bjornv@webrtc.org <bjornv@webrtc.org> | 2014-10-13 14:00:43 +0000 |
| commit | 1d0c7333a2246440cacbea76aba5291d0a1e715c (patch) | |
| tree | 820af2bb5ddf52b038564f319a12df5fb638ee3a /common_audio/vad | |
| parent | 88f9c81aca9e9c7ef48eaa4e837ec4fa17572dab (diff) | |
| download | webrtc-1d0c7333a2246440cacbea76aba5291d0a1e715c.tar.gz | |
common_audio: Removed macro WEBRTC_SPL_RSHIFT_W16
Replaced the trivial right shift macro at remaining 4 places and removed from signal_processing.
Affected components:
* vad
* aecm
BUG=3348,3353
TESTED=locally on linux and trybots
R=kwiberg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/25849004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7434 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'common_audio/vad')
| -rw-r--r-- | common_audio/vad/vad_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common_audio/vad/vad_core.c b/common_audio/vad/vad_core.c index 98da6eaf..6ebe65d8 100644 --- a/common_audio/vad/vad_core.c +++ b/common_audio/vad/vad_core.c @@ -639,10 +639,10 @@ int WebRtcVad_CalcVad32khz(VadInstT* inst, const int16_t* speech_frame, // Downsample signal 32->16->8 before doing VAD WebRtcVad_Downsampling(speech_frame, speechWB, &(inst->downsampling_filter_states[2]), frame_length); - len = WEBRTC_SPL_RSHIFT_W16(frame_length, 1); + len = frame_length / 2; WebRtcVad_Downsampling(speechWB, speechNB, inst->downsampling_filter_states, len); - len = WEBRTC_SPL_RSHIFT_W16(len, 1); + len /= 2; // Do VAD on an 8 kHz signal vad = WebRtcVad_CalcVad8khz(inst, speechNB, len); @@ -660,7 +660,7 @@ int WebRtcVad_CalcVad16khz(VadInstT* inst, const int16_t* speech_frame, WebRtcVad_Downsampling(speech_frame, speechNB, inst->downsampling_filter_states, frame_length); - len = WEBRTC_SPL_RSHIFT_W16(frame_length, 1); + len = frame_length / 2; vad = WebRtcVad_CalcVad8khz(inst, speechNB, len); return vad; |