From cf1375a1f1698300e6e93cba878575e93777ab34 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Fri, 21 Sep 2012 17:39:45 +0000 Subject: [PATCH] Make SetAndroidAudioDeviceObjects return 0 Description: Make SetAndroidAudioDeviceObjects return 0 so application can work with both java and opensl implementation without code change. BUG=None TEST=trybot Review URL: https://webrtc-codereview.appspot.com/817004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2802 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/android/audio_device_android_jni.cc | 4 ++++ src/voice_engine/voice_engine_impl.cc | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/audio_device/main/source/android/audio_device_android_jni.cc b/src/modules/audio_device/main/source/android/audio_device_android_jni.cc index 9c2935bd40..a419badf93 100644 --- a/src/modules/audio_device/main/source/android/audio_device_android_jni.cc +++ b/src/modules/audio_device/main/source/android/audio_device_android_jni.cc @@ -15,7 +15,9 @@ // TODO(xians): Break out attach and detach current thread to JVM to // separate functions. +#include #include + #include "audio_device_utility.h" #include "audio_device_android_jni.h" #include "audio_device_config.h" @@ -44,6 +46,8 @@ WebRtc_Word32 AudioDeviceAndroidJni::SetAndroidAudioDeviceObjects( void* javaVM, void* env, void* context) { + __android_log_print(ANDROID_LOG_DEBUG, "WEBRTC", "JNI:%s", __FUNCTION__); + // TODO(leozwang): Make this function thread-safe. globalJvm = reinterpret_cast(javaVM); diff --git a/src/voice_engine/voice_engine_impl.cc b/src/voice_engine/voice_engine_impl.cc index c791fdb2c7..7b3c834c22 100644 --- a/src/voice_engine/voice_engine_impl.cc +++ b/src/voice_engine/voice_engine_impl.cc @@ -144,9 +144,13 @@ bool VoiceEngine::Delete(VoiceEngine*& voiceEngine) int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) { -#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_ANDROID_OPENSLES) +#ifdef WEBRTC_ANDROID +#ifdef WEBRTC_ANDROID_OPENSLES + return 0; +#else return AudioDeviceAndroidJni::SetAndroidAudioDeviceObjects( javaVM, env, context); +#endif #else return -1; #endif