Adding support for OpenSL ES output in native WebRTC
BUG=4573,2982,2175,3590 TEST=modules_unittests --gtest_filter=AudioDevice*, AppRTCDemo and WebRTCDemo Summary: - Removes dependency of the 'enable_android_opensl' compiler flag. Instead, OpenSL ES is always supported, and will enabled for devices that supports low-latency output. - WebRTC no longer supports OpenSL ES for the input/recording side. - Removes old code and demos using OpenSL ES for audio input. - Improves accuracy of total delay estimates (better AEC performance). - Reduces roundtrip audio latency; especially when OpenSL can be used. Performance verified on: Nexus 5, 6, 7 and 9. Samsung Galaxy S4 and S6. Android One device. R=magjed@webrtc.org, phoglund@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/51759004 Cr-Commit-Position: refs/heads/master@{#9208}
This commit is contained in:
@ -17,8 +17,7 @@
|
||||
#include "webrtc/modules/audio_device/android/audio_device_template.h"
|
||||
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
|
||||
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
|
||||
#include "webrtc/modules/audio_device/android/opensles_input.h"
|
||||
#include "webrtc/modules/audio_device/android/opensles_output.h"
|
||||
#include "webrtc/modules/utility/interface/jvm_android.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace audiodevicemodule {
|
||||
@ -32,15 +31,14 @@ void EnsureInitializedOnce() {
|
||||
CHECK_EQ(0, jni->GetJavaVM(&jvm));
|
||||
jobject context = ::base::android::GetApplicationContext();
|
||||
|
||||
// Provide JVM and context to Java and OpenSL ES implementations.
|
||||
// Initialize the Java environment (currently only used by the audio manager).
|
||||
webrtc::JVM::Initialize(jvm, context);
|
||||
// TODO(henrika): remove this call when AudioRecordJni and AudioTrackJni
|
||||
// are modified to use the same sort of Java initialization as the audio
|
||||
// manager.
|
||||
using AudioDeviceJava = AudioDeviceTemplate<AudioRecordJni, AudioTrackJni>;
|
||||
AudioDeviceJava::SetAndroidAudioDeviceObjects(jvm, context);
|
||||
|
||||
// TODO(henrika): enable OpenSL ES when it has been refactored to avoid
|
||||
// crashes.
|
||||
// using AudioDeviceOpenSLES =
|
||||
// AudioDeviceTemplate<OpenSlesInput, OpenSlesOutput>;
|
||||
// AudioDeviceOpenSLES::SetAndroidAudioDeviceObjects(jvm, context);
|
||||
}
|
||||
|
||||
void EnsureInitialized() {
|
||||
|
||||
Reference in New Issue
Block a user