wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 932112: Initialize both JNI and OpenSLES so fallback can work. r=jesup

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2013-11-07 20:07:48 -05:00
parent c3799f59ab
commit 8bd826d6aa
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
media/webrtc/trunk/webrtc/voice_engine/voice_engine_impl.cc
View File

@ -11,7 +11,8 @@
#if !defined(WEBRTC_GONK)
#if defined(WEBRTC_ANDROID_OPENSLES)
#include "webrtc/modules/audio_device/android/audio_manager_jni.h"
#elif defined(WEBRTC_ANDROID)
#endif
#if defined(WEBRTC_ANDROID)
#include "webrtc/modules/audio_device/android/audio_device_jni_android.h"
#endif
#endif
@ -147,19 +148,17 @@ bool VoiceEngine::Delete(VoiceEngine*& voiceEngine)
int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context)
{
#if !defined(WEBRTC_GONK)
#if !defined(WEBRTC_GONK) && defined(ANDROID)
#if defined(WEBRTC_ANDROID_OPENSLES)
// Initialize both backends. The OpenSLES one will fall back
// to JNI if some failure happens.
AudioManagerJni::SetAndroidAudioDeviceObjects(javaVM, env, context);
return 0;
#elif defined(ANDROID)
#endif
return AudioDeviceAndroidJni::SetAndroidAudioDeviceObjects(
javaVM, env, context);
#else
return -1;
#endif
#else
return -1;
#endif
}
} // namespace webrtc