Surface the IntelligibilityEnhancer on MediaConstraints

webrtc/modules/audio_device/android/audio_manager.cc

Index: webrtc/modules/audio_device/android/audio_manager.cc
diff --git a/webrtc/modules/audio_device/android/audio_manager.cc b/webrtc/modules/audio_device/android/audio_manager.cc
index 01e5d5fe4f28c22749ef1244226f66d257cea2bd..5857925f6099a1c65408651093489972e5f3cd30 100644
--- a/webrtc/modules/audio_device/android/audio_manager.cc
+++ b/webrtc/modules/audio_device/android/audio_manager.cc
@@ -72,6 +72,7 @@ AudioManager::AudioManager()
       hardware_aec_(false),
       hardware_agc_(false),
       hardware_ns_(false),
+      intelligibility_(false),
       low_latency_playout_(false),
       delay_estimate_in_milliseconds_(0) {
   ALOGD("ctor%s", GetThreadInfo().c_str());
@@ -158,6 +159,11 @@ bool AudioManager::IsNoiseSuppressorSupported() const {
   return hardware_ns_;
 }
 
+bool AudioManager::IsIntelligibilityEnhancerEnabled() const {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return intelligibility_;
+}
+
 bool AudioManager::IsLowLatencyPlayoutSupported() const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   ALOGD("IsLowLatencyPlayoutSupported()");
@@ -178,6 +184,7 @@ void JNICALL AudioManager::CacheAudioParameters(JNIEnv* env,
                                                 jboolean hardware_aec,
                                                 jboolean hardware_agc,
                                                 jboolean hardware_ns,
+                                                jboolean intelligibility,
                                                 jboolean low_latency_output,
                                                 jint output_buffer_size,
                                                 jint input_buffer_size,
@@ -186,7 +193,8 @@ void JNICALL AudioManager::CacheAudioParameters(JNIEnv* env,
       reinterpret_cast<webrtc::AudioManager*>(native_audio_manager);
   this_object->OnCacheAudioParameters(
       env, sample_rate, channels, hardware_aec, hardware_agc, hardware_ns,
-      low_latency_output, output_buffer_size, input_buffer_size);
+      intelligibility, low_latency_output, output_buffer_size,
+      input_buffer_size);
 }
 
 void AudioManager::OnCacheAudioParameters(JNIEnv* env,
@@ -195,6 +203,7 @@ void AudioManager::OnCacheAudioParameters(JNIEnv* env,
                                           jboolean hardware_aec,
                                           jboolean hardware_agc,
                                           jboolean hardware_ns,
+                                          jboolean intelligibility,
                                           jboolean low_latency_output,
                                           jint output_buffer_size,
                                           jint input_buffer_size) {
@@ -202,6 +211,7 @@ void AudioManager::OnCacheAudioParameters(JNIEnv* env,
   ALOGD("hardware_aec: %d", hardware_aec);
   ALOGD("hardware_agc: %d", hardware_agc);
   ALOGD("hardware_ns: %d", hardware_ns);
+  ALOGD("intelligibility: %d", intelligibility);
   ALOGD("low_latency_output: %d", low_latency_output);
   ALOGD("sample_rate: %d", sample_rate);
   ALOGD("channels: %d", channels);
@@ -211,6 +221,7 @@ void AudioManager::OnCacheAudioParameters(JNIEnv* env,
   hardware_aec_ = hardware_aec;
   hardware_agc_ = hardware_agc;
   hardware_ns_ = hardware_ns;
+  intelligibility_ = intelligibility;
   low_latency_playout_ = low_latency_output;
   // TODO(henrika): add support for stereo output.
   playout_parameters_.reset(sample_rate, static_cast<size_t>(channels),