From 1a79bb8d30f29a3609692edba53d9c110c59b6c5 Mon Sep 17 00:00:00 2001 From: "braveyao@webrtc.org" Date: Wed, 21 May 2014 03:37:45 +0000 Subject: [PATCH] WebRTCDemo: clean the error message due to API clean up and add ability to route the audio through all three outputs, headset/earpiece/loudspeaker BUG=3366 TEST=Manual Test R=fischman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/17559004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6207 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../src/org/webrtc/webrtcdemo/MediaEngine.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/MediaEngine.java b/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/MediaEngine.java index 46aa6d4aaf..f628431582 100644 --- a/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/MediaEngine.java +++ b/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/MediaEngine.java @@ -22,6 +22,7 @@ import android.content.IntentFilter; import android.hardware.Camera.CameraInfo; import android.hardware.Camera; import android.hardware.SensorManager; +import android.media.AudioManager; import android.os.Environment; import android.util.Log; import android.view.OrientationEventListener; @@ -194,6 +195,10 @@ public class MediaEngine implements VideoDecodeEncodeObserver { } }; orientationListener.enable(); + // Set audio mode to communication + AudioManager audioManager = + ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE)); + audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION); // Listen to headset being plugged in/out. IntentFilter receiverFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG); headsetListener = new BroadcastReceiver() { @@ -423,8 +428,9 @@ public class MediaEngine implements VideoDecodeEncodeObserver { private void updateAudioOutput() { boolean useSpeaker = !headsetPluggedIn && speakerEnabled; - check(voe.setLoudspeakerStatus(useSpeaker) == 0, - "Failed updating loudspeaker"); + AudioManager audioManager = + ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE)); + audioManager.setSpeakerphoneOn(useSpeaker); } public void startViE() {