diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-10 18:24:07 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-10 18:24:07 +0000 |
| commit | f46fff61745ab9bf19a7075a105e5d96308c5526 (patch) | |
| tree | 33a02441c8a51621600911b92895846109f98d70 /voice_engine | |
| parent | dadb2a18d18963ec55d5bfa85694fe96301f3239 (diff) | |
| download | webrtc-f46fff61745ab9bf19a7075a105e5d96308c5526.tar.gz | |
OpenSL (not default): Enables low latency audio on Android.
BUG=1669
R=andrew@webrtc.org, fischman@webrtc.org, niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2032004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4719 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine')
| -rw-r--r-- | voice_engine/voice_engine_impl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc index e01a2cd1..4c923ebc 100644 --- a/voice_engine/voice_engine_impl.cc +++ b/voice_engine/voice_engine_impl.cc @@ -8,9 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_ANDROID_OPENSLES) +#if defined(WEBRTC_ANDROID) +#if defined(WEBRTC_ANDROID_OPENSLES) +#include "webrtc/modules/audio_device/android/audio_manager_jni.h" +#else #include "webrtc/modules/audio_device/android/audio_device_jni_android.h" #endif +#endif #include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/voice_engine/voice_engine_impl.h" @@ -142,6 +146,7 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) { #ifdef WEBRTC_ANDROID #ifdef WEBRTC_ANDROID_OPENSLES + AudioManagerJni::SetAndroidAudioDeviceObjects(javaVM, env, context); return 0; #else return AudioDeviceAndroidJni::SetAndroidAudioDeviceObjects( |