Index: webrtc/modules/audio_device/audio_device_impl.cc |
diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc |
index 01c8cee780e9eb30fa087a978ac8e2c3a809fe49..02fa9d9e3451c096e4351edf8b3cfcc4887fea36 100644 |
--- a/webrtc/modules/audio_device/audio_device_impl.cc |
+++ b/webrtc/modules/audio_device/audio_device_impl.cc |
@@ -1869,34 +1869,47 @@ int32_t AudioDeviceModuleImpl::SetLoudspeakerStatus(bool enable) |
// GetLoudspeakerStatus |
// ---------------------------------------------------------------------------- |
-int32_t AudioDeviceModuleImpl::GetLoudspeakerStatus(bool* enabled) const |
-{ |
- CHECK_INITIALIZED(); |
+int32_t AudioDeviceModuleImpl::GetLoudspeakerStatus(bool* enabled) const { |
+ CHECK_INITIALIZED(); |
+ if (_ptrAudioDevice->GetLoudspeakerStatus(*enabled) != 0) { |
+ return -1; |
+ } |
+ return 0; |
+} |
- if (_ptrAudioDevice->GetLoudspeakerStatus(*enabled) != 0) |
- { |
- return -1; |
- } |
+bool AudioDeviceModuleImpl::BuiltInAECIsEnabled() const { |
+ CHECK_INITIALIZED_BOOL(); |
+ return _ptrAudioDevice->BuiltInAECIsEnabled(); |
+} |
- return 0; |
+bool AudioDeviceModuleImpl::BuiltInAECIsAvailable() const { |
+ CHECK_INITIALIZED_BOOL(); |
+ return _ptrAudioDevice->BuiltInAECIsAvailable(); |
} |
-int32_t AudioDeviceModuleImpl::EnableBuiltInAEC(bool enable) |
-{ |
+int32_t AudioDeviceModuleImpl::EnableBuiltInAEC(bool enable) { |
CHECK_INITIALIZED(); |
return _ptrAudioDevice->EnableBuiltInAEC(enable); |
} |
-bool AudioDeviceModuleImpl::BuiltInAECIsEnabled() const |
-{ |
- CHECK_INITIALIZED_BOOL(); |
+bool AudioDeviceModuleImpl::BuiltInAGCIsAvailable() const { |
+ CHECK_INITIALIZED_BOOL(); |
+ return _ptrAudioDevice->BuiltInAGCIsAvailable(); |
+} |
- return _ptrAudioDevice->BuiltInAECIsEnabled(); |
+int32_t AudioDeviceModuleImpl::EnableBuiltInAGC(bool enable) { |
+ CHECK_INITIALIZED(); |
+ return _ptrAudioDevice->EnableBuiltInAGC(enable); |
} |
-bool AudioDeviceModuleImpl::BuiltInAECIsAvailable() const { |
+bool AudioDeviceModuleImpl::BuiltInNSIsAvailable() const { |
CHECK_INITIALIZED_BOOL(); |
- return _ptrAudioDevice->BuiltInAECIsAvailable(); |
+ return _ptrAudioDevice->BuiltInNSIsAvailable(); |
+} |
+ |
+int32_t AudioDeviceModuleImpl::EnableBuiltInNS(bool enable) { |
+ CHECK_INITIALIZED(); |
+ return _ptrAudioDevice->EnableBuiltInNS(enable); |
} |
int AudioDeviceModuleImpl::GetPlayoutAudioParameters( |