From 999445a1bbda2ebc511d3c86807f2173d3f084a8 Mon Sep 17 00:00:00 2001 From: henrika Date: Fri, 5 May 2017 02:03:32 -0700 Subject: [PATCH] Blacklisting of HW-AEC/NS and OpenSL must now be done by the WebRTC client. BUG=NONE Review-Url: https://codereview.webrtc.org/2858263002 Cr-Commit-Position: refs/heads/master@{#18025} --- .../org/webrtc/voiceengine/WebRtcAudioUtils.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java index 800a93f527..5689d20ef5 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java @@ -26,20 +26,24 @@ public final class WebRtcAudioUtils { // the low latency output mode in combination with OpenSL ES. // The device name is given by Build.MODEL. private static final String[] BLACKLISTED_OPEN_SL_ES_MODELS = new String[] { - // This list is currently empty ;-) + // It is recommended to maintain a list of blacklisted models outside + // this package and instead call + // WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true) + // from the client for devices where OpenSL ES shall be disabled. }; // List of devices where it has been verified that the built-in effect // bad and where it makes sense to avoid using it and instead rely on the // native WebRTC version instead. The device name is given by Build.MODEL. private static final String[] BLACKLISTED_AEC_MODELS = new String[] { - "D6503", // Sony Xperia Z2 D6503 - "ONE A2005", // OnePlus 2 - "MotoG3", // Moto G (3rd Generation) + // It is recommended to maintain a list of blacklisted models outside + // this package and instead call setWebRtcBasedAcousticEchoCanceler(true) + // from the client for devices where the built-in AEC shall be disabled. }; private static final String[] BLACKLISTED_NS_MODELS = new String[] { - "Nexus 10", "Nexus 9", - "ONE A2005", // OnePlus 2 + // It is recommended to maintain a list of blacklisted models outside + // this package and instead call setWebRtcBasedNoiseSuppressor(true) + // from the client for devices where the built-in NS shall be disabled. }; // Use 16kHz as the default sample rate. A higher sample rate might prevent