Integrate Intelligibility with APM

webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc

Index: webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
index ee9306dd834abde94310c205d587aee984a17592..f3494f42ca019a0fa9aefe475f01c5279dfff9c0 100644
--- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -234,6 +234,7 @@ void RunTest(std::string out_path) {
   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)
@@ -421,6 +422,7 @@ void RunTest(std::string out_path) {
       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++);
@@ -498,6 +500,8 @@ void RunTest(std::string out_path) {
         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");
@@ -505,6 +509,18 @@ void RunTest(std::string out_path) {
           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;