From 5c489c9d3e03e57a1c626928ff828b2118626983 Mon Sep 17 00:00:00 2001 From: henrika Date: Tue, 17 Nov 2015 10:12:39 -0800 Subject: [PATCH] Add OpenSL ES enable setting to AppRTCDemo (part 2). It is now possible to enable OpenSL ES on devices that supports it. Fix for https://codereview.webrtc.org/1449083002/ Review URL: https://codereview.webrtc.org/1455563002 Cr-Commit-Position: refs/heads/master@{#10678} --- .../src/org/appspot/apprtc/PeerConnectionClient.java | 5 ++++- .../java/src/org/webrtc/voiceengine/WebRtcAudioManager.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 3ad27d6d8a..7c292aeee7 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -309,8 +309,11 @@ public class PeerConnectionClient { // Enable/disable OpenSL ES playback. if (!peerConnectionParameters.useOpenSLES) { - Log.d(TAG, "Disable OpenSL ES audio"); + Log.d(TAG, "Disable OpenSL ES audio even if device supports it"); WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true /* enable */); + } else { + Log.d(TAG, "Allow OpenSL ES audio if device supports it"); + WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(false); } // Create peer connection factory. diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java index f40317b25d..1213f333d9 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java @@ -123,7 +123,7 @@ public class WebRtcAudioManager { return (audioManager.getMode() == AudioManager.MODE_IN_COMMUNICATION); } - private boolean isDeviceBlacklistedForOpenSLESUsage() { + private boolean isDeviceBlacklistedForOpenSLESUsage() { boolean blacklisted = blacklistDeviceForOpenSLESUsageIsOverridden ? blacklistDeviceForOpenSLESUsage : WebRtcAudioUtils.deviceIsBlacklistedForOpenSLESUsage();