diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-11-06 18:39:40 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-11-06 18:39:40 +0000 |
| commit | 0dd483fedbcd03506db5e382204543020f168a4d (patch) | |
| tree | 21133262e500244ec21d71417b95df7036d6f346 /voice_engine/voe_audio_processing_impl.cc | |
| parent | a8054d44fcf5a5b9b3bda4ece4dc853529b7d74c (diff) | |
| download | webrtc-0dd483fedbcd03506db5e382204543020f168a4d.tar.gz | |
Check the channels in receive-side processing frames.
The number of channels must be set correctly before calling ProcessStream. This
was preventing stereo frames from being processed.
Also fix voe_cmd_test, which wasn't enabling rx NS properly.
BUG=issue713, 7375579
Review URL: https://webrtc-codereview.appspot.com/929013
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3047 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voe_audio_processing_impl.cc')
| -rw-r--r-- | voice_engine/voe_audio_processing_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/voice_engine/voe_audio_processing_impl.cc b/voice_engine/voe_audio_processing_impl.cc index 63909709..62440f4e 100644 --- a/voice_engine/voe_audio_processing_impl.cc +++ b/voice_engine/voe_audio_processing_impl.cc @@ -356,7 +356,7 @@ int VoEAudioProcessingImpl::SetRxNsStatus(int channel, WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "SetRxNsStatus(channel=%d, enable=%d, mode=%d)", channel, (int)enable, (int)mode); -#ifdef WEBRTC_VOICE_ENGINE_AGC +#ifdef WEBRTC_VOICE_ENGINE_NR if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; @@ -372,7 +372,7 @@ int VoEAudioProcessingImpl::SetRxNsStatus(int channel, return channelPtr->SetRxNsStatus(enable, mode); #else _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError, - "SetRxNsStatus() AGC is not supported"); + "SetRxNsStatus() NS is not supported"); return -1; #endif } @@ -382,7 +382,7 @@ int VoEAudioProcessingImpl::GetRxNsStatus(int channel, NsModes& mode) { WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), "GetRxNsStatus(channel=%d, enable=?, mode=?)", channel); -#ifdef WEBRTC_VOICE_ENGINE_AGC +#ifdef WEBRTC_VOICE_ENGINE_NR if (!_shared->statistics().Initialized()) { _shared->SetLastError(VE_NOT_INITED, kTraceError); return -1; @@ -398,7 +398,7 @@ int VoEAudioProcessingImpl::GetRxNsStatus(int channel, return channelPtr->GetRxNsStatus(enabled, mode); #else _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError, - "GetRxNsStatus() Agc is not supported"); + "GetRxNsStatus() NS is not supported"); return -1; #endif } |