Integrate Intelligibility with APM

webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc

 /*
  *  Copyright (c) 2012 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 216 matching lines @@
   bool enable_agc = false;
   bool enable_rx_agc = false;
   bool enable_cng = false;
   bool enable_ns = false;
   bool enable_rx_ns = false;
   bool typing_detection = false;
   bool muted = false;
   bool opus_stereo = false;
   bool opus_dtx = false;
   bool experimental_ns_enabled = false;
+  bool intelligibility_enabled = false;

[Andrew MacDonald, 2015/07/24 23:50:40]

Revert changes to this file now that SetExtraOptions doesn't work.

[ekm, 2015/07/29 00:37:19]

Done.

   bool debug_recording_started = false;
 
 #if defined(WEBRTC_ANDROID)
   std::string resource_path = "/sdcard/";
 #else
   std::string resource_path = webrtc::test::ProjectRootPath();
   if (resource_path == webrtc::test::kCannotFindProjectRootDir) {
     printf("*** Unable to get project root directory. "
            "File playing may fail. ***\n");
     // Fall back to the current directory.
@@ skipping 167 matching lines @@
     while (forever) {
       printf("\nSelect codec\n");
       PrintCodecs(opus_stereo);
       printf("\nOther actions\n");
       const int num_codecs = codec->NumOfCodecs();
       int option_index = num_codecs;
       printf("%i. Toggle CNG\n", option_index++);
       printf("%i. Toggle AGC\n", option_index++);
       printf("%i. Toggle NS\n", option_index++);
       printf("%i. Toggle experimental NS\n", option_index++);
+      printf("%i. Toggle intelligibility enhancer\n", option_index++);
       printf("%i. Toggle EC\n", option_index++);
       printf("%i. Select AEC\n", option_index++);
       printf("%i. Select AECM\n", option_index++);
       printf("%i. Get speaker volume\n", option_index++);
       printf("%i. Set speaker volume\n", option_index++);
       printf("%i. Get microphone volume\n", option_index++);
       printf("%i. Set microphone volume\n", option_index++);
       printf("%i. Play local file (audio_long16.pcm) \n", option_index++);
       printf("%i. Change playout device \n", option_index++);
       printf("%i. Change recording device \n", option_index++);
@@ skipping 57 matching lines @@
         res = apm->SetNsStatus(enable_ns);
         VALIDATE;
         if (enable_ns)
           printf("\n NS is now on! \n");
         else
           printf("\n NS is now off! \n");
       } else if (option_selection == option_index++) {
         experimental_ns_enabled = !experimental_ns_enabled;
         Config config;
         config.Set<ExperimentalNs>(new ExperimentalNs(experimental_ns_enabled));
+        config.Set<Intelligibility>(
+            new Intelligibility(intelligibility_enabled));
         base1->audio_processing()->SetExtraOptions(config);
         if (experimental_ns_enabled) {
           printf("\n Experimental NS is now on!\n");
         } else {
           printf("\n Experimental NS is now off!\n");
         }
       } else if (option_selection == option_index++) {
+        intelligibility_enabled = !intelligibility_enabled;
+        Config config;
+        config.Set<ExperimentalNs>(new ExperimentalNs(experimental_ns_enabled));
+        config.Set<Intelligibility>(
+            new Intelligibility(intelligibility_enabled));
+        base1->audio_processing()->SetExtraOptions(config);
+        if (intelligibility_enabled) {
+          printf("\n Intelligibility Enhancement is now on!\n");
+        } else {
+          printf("\n Intelligibility Enhancement is now off!\n");
+        }
+      } else if (option_selection == option_index++) {
         enable_aec = !enable_aec;
         res = apm->SetEcStatus(enable_aec, kEcUnchanged);
         VALIDATE;
         if (enable_aec)
           printf("\n Echo control is now on! \n");
         else
           printf("\n Echo control is now off! \n");
       } else if (option_selection == option_index++) {
         res = apm->SetEcStatus(enable_aec, kEcAec);
         VALIDATE;
@@ skipping 337 matching lines @@
 
   printf("Delete channels \n");
   res = base1->DeleteChannel(chan);
   VALIDATE;
 
   for (int i = 0; i < kMaxNumChannels; ++i) {
     res = base1->DeleteChannel(channels[i]);
     VALIDATE;
   }
 }