Improving support for Android Audio Effects in WebRTC

webrtc/modules/audio_device/android/audio_record_jni.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 12 matching lines @@
 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
 #define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__)
 #define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
 
 namespace webrtc {
 
 // AudioRecordJni::JavaAudioRecord implementation.
 AudioRecordJni::JavaAudioRecord::JavaAudioRecord(
     NativeRegistration* native_reg, rtc::scoped_ptr<GlobalRef> audio_record)
     : audio_record_(audio_record.Pass()),
-      init_recording_(native_reg->GetMethodId("InitRecording", "(II)I")),
-      start_recording_(native_reg->GetMethodId("StartRecording", "()Z")),
-      stop_recording_(native_reg->GetMethodId("StopRecording", "()Z")),
+      init_recording_(native_reg->GetMethodId("initRecording", "(II)I")),
+      start_recording_(native_reg->GetMethodId("startRecording", "()Z")),
+      stop_recording_(native_reg->GetMethodId("stopRecording", "()Z")),
       enable_built_in_aec_(native_reg->GetMethodId(
-          "EnableBuiltInAEC", "(Z)Z")) {
+          "enableBuiltInAEC", "(Z)Z")),
+      enable_built_in_agc_(native_reg->GetMethodId(
+          "enableBuiltInAGC", "(Z)Z")),
+      enable_built_in_ns_(native_reg->GetMethodId(
+          "enableBuiltInNS", "(Z)Z")) {
 }
 
 AudioRecordJni::JavaAudioRecord::~JavaAudioRecord() {}
 
 int AudioRecordJni::JavaAudioRecord::InitRecording(
     int sample_rate, int channels) {
   return audio_record_->CallIntMethod(init_recording_,
                                       static_cast<jint>(sample_rate),
                                       static_cast<jint>(channels));
 }
 
 bool AudioRecordJni::JavaAudioRecord::StartRecording() {
   return audio_record_->CallBooleanMethod(start_recording_);
 }
 
 bool AudioRecordJni::JavaAudioRecord::StopRecording() {
   return audio_record_->CallBooleanMethod(stop_recording_);
 }
 
 bool AudioRecordJni::JavaAudioRecord::EnableBuiltInAEC(bool enable) {
   return audio_record_->CallBooleanMethod(enable_built_in_aec_,
                                           static_cast<jboolean>(enable));
 }
 
+bool AudioRecordJni::JavaAudioRecord::EnableBuiltInAGC(bool enable) {
+  return audio_record_->CallBooleanMethod(enable_built_in_agc_,
+                                          static_cast<jboolean>(enable));
+}
+
+bool AudioRecordJni::JavaAudioRecord::EnableBuiltInNS(bool enable) {
+  return audio_record_->CallBooleanMethod(enable_built_in_ns_,
+                                          static_cast<jboolean>(enable));
+}
+
 // AudioRecordJni implementation.
 AudioRecordJni::AudioRecordJni(AudioManager* audio_manager)
     : j_environment_(JVM::GetInstance()->environment()),
       audio_manager_(audio_manager),
       audio_parameters_(audio_manager->GetRecordAudioParameters()),
       total_delay_in_milliseconds_(0),
       direct_buffer_address_(nullptr),
       direct_buffer_capacity_in_bytes_(0),
       frames_per_buffer_(0),
       initialized_(false),
@@ skipping 107 matching lines @@
   RTC_DCHECK_GT(total_delay_in_milliseconds_, 0);
   ALOGD("total_delay_in_milliseconds: %d", total_delay_in_milliseconds_);
 }
 
 int32_t AudioRecordJni::EnableBuiltInAEC(bool enable) {
   ALOGD("EnableBuiltInAEC%s", GetThreadInfo().c_str());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   return j_audio_record_->EnableBuiltInAEC(enable) ? 0 : -1;
 }
 
+int32_t AudioRecordJni::EnableBuiltInAGC(bool enable) {
+  ALOGD("EnableBuiltInAGC%s", GetThreadInfo().c_str());
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return j_audio_record_->EnableBuiltInAGC(enable) ? 0 : -1;
+}
+
+int32_t AudioRecordJni::EnableBuiltInNS(bool enable) {
+  ALOGD("EnableBuiltInNS%s", GetThreadInfo().c_str());
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return j_audio_record_->EnableBuiltInNS(enable) ? 0 : -1;
+}
+
 void JNICALL AudioRecordJni::CacheDirectBufferAddress(
     JNIEnv* env, jobject obj, jobject byte_buffer, jlong nativeAudioRecord) {
   webrtc::AudioRecordJni* this_object =
       reinterpret_cast<webrtc::AudioRecordJni*> (nativeAudioRecord);
   this_object->OnCacheDirectBufferAddress(env, byte_buffer);
 }
 
 void AudioRecordJni::OnCacheDirectBufferAddress(
     JNIEnv* env, jobject byte_buffer) {
   ALOGD("OnCacheDirectBufferAddress");
@@ skipping 28 matching lines @@
   // of |playDelayMs| and |recDelayMs|, hence the distributions does not matter.
   audio_device_buffer_->SetVQEData(total_delay_in_milliseconds_,
                                    0,   // recDelayMs
                                    0);  // clockDrift
   if (audio_device_buffer_->DeliverRecordedData() == -1) {
     ALOGE("AudioDeviceBuffer::DeliverRecordedData failed!");
   }
 }
 
 }  // namespace webrtc