From f17ee9c709cfb12539830c78b575d6b2f9397cb6 Mon Sep 17 00:00:00 2001
From: "aluebs@webrtc.org" <aluebs@webrtc.org>
Date: Thu, 29 Jan 2015 00:03:53 +0000
Subject: [PATCH] Add case to ApmTest.Process to test the extended filter mode

R=andrew@webrtc.org, bjornv@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/40509004

Cr-Commit-Position: refs/heads/master@{#8192}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8192 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 data/audio_processing/output_data_fixed.pb    | Bin 188 -> 204 bytes
 data/audio_processing/output_data_float.pb    | Bin 1404 -> 1529 bytes
 data/audio_processing/output_data_mac.pb      | Bin 0 -> 1529 bytes
 .../test/audio_processing_unittest.cc         |  26 ++++++++++++++++--
 .../audio_processing/test/unittest.proto      |   1 +
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 data/audio_processing/output_data_mac.pb

diff --git a/data/audio_processing/output_data_fixed.pb b/data/audio_processing/output_data_fixed.pb
index 6e36d5594ab36bdfa11952265f54d682afa4b494..efc95631ee0cca1c954c938d163dbe9f7a304ba1 100644
GIT binary patch
literal 204
zcmX@Xz`(#I&cP_aD8Z<3z|NrF;-rWJgU3OZ0EP;LL_;l5;;txA;yyxxNrDNYW4#1W
s;sB}ySjRj`pu|U*1QRYhAQE65_ds?$N9aJcV>7A*SjSwD9bdo_00Oova{vGU

literal 188
zcmdnNz`(#I%E2hWD8Z<3z|NrF;-rWJgU3OZ0EBQuEl~KbC{Xx5OqfZ638H$v1W@<@
qvM^ZnJV~JNM~E;JcC#VEVAc0PW<Q6iMm2jgvM^ZnT#(scfWiPZqbHL9

diff --git a/data/audio_processing/output_data_float.pb b/data/audio_processing/output_data_float.pb
index 0fd2fe8cd845015c59aa78b735bc2f0004b06a75..13805c05061a7612c78fdc1e55c35c096e081c57 100644
GIT binary patch
delta 216
zcmeyv^^=?JD=Py7SN}w|K9&jwuI!1^GC_3CWJbm;5Tk!`E+bebY4Tsj1dvGb<ank;
zh}0n_h^EOw%uro>nW4HgS)jUhvOsl7vnHm4v~w^CFi9{eH2h*TXlJyTBjoUu$zu^y
z07H}&7YB!|fUJb9f~=4f$M648z$m~f!LESdN^x*72uMiCC@?62SnLuU3JggsKo(1e
MRH^lMIr|Dm0KHN_fdBvi

delta 90
zcmey#{fCRKf|Y@Rt9K$>9}`#R#2J}PTv?M@8MBzUdM6h%0>u(0voa+xaV1X9WJ&}H
do?`+joSeW6R(X~gtkRkVtnw@iSfwFrA^?jk8H)e_

diff --git a/data/audio_processing/output_data_mac.pb b/data/audio_processing/output_data_mac.pb
new file mode 100644
index 0000000000000000000000000000000000000000..a74778f222f3b1608062838c81daa072bb2fcc34
GIT binary patch
literal 1529
zcmc(fJxjwt7{~9fjlIUANkP0OF*%%7ItB+@aOvpe;MgJ-bPc!&6~wp2FCfk$iUmal
zQ55|SB8cE5j#>&*2fdf1sZ|l$ika??<NnX{<M*Vh0HAI_3^hm~y%<ZcL${L1KBHVI
zG6AM$)FHh2?tf4Vmn2-$aGBI`r16qMBZki24sVb+g@ZZ<jYp7ze3Tu5qUBW&&CEPd
zXZ?ao3+XlJZuexLQ0@}3g2q*hP0b`GHIoK@3rp)Fn1)*ev-kQ4p`bZT6=9f#ncm)k
z!^7r+uo~p;--@*Bj;BqIh%^Bk5yWAyLibqXuoqi{jT$jVDQbot`x!Q7{VSG$ooD^?
zf*9;&=)UM2_8D(~l)<(&o7mK5uxlY~g~VvM6|hrefWhY2RnlE&Y<T4dn=>v18I17?
zbWf5zq#T4ennN7w{2F4gQoakBu80tZ7Jcz}y*0FLdVCXjEDMqz?+CN5I&Rid;ISVj
zJ-+)Rk9+GLBcYA-_~@TJ=5u^+`X0-Iq{mg^@p+(FyB==^9{U;6<I~Q1JS;sfFpb4P
t%8=b;_7UawgH9~XA{Mni|Ni(yHvRtkNy;CVxId8zEm}0Z%qtrf_yN9JS{MKT

literal 0
HcmV?d00001

diff --git a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
index 931169e847..7e36d67927 100644
--- a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
+++ b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
@@ -381,7 +381,13 @@ ApmTest::ApmTest()
 #if defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)
       ref_filename_(ref_path_ + "output_data_fixed.pb"),
 #elif defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE)
+#if defined(WEBRTC_MAC)
+      // A different file for Mac is needed because on this platform the AEC
+      // constant |kFixedDelayMs| value is 20 and not 50 as it is on the rest.
+      ref_filename_(ref_path_ + "output_data_mac.pb"),
+#else
       ref_filename_(ref_path_ + "output_data_float.pb"),
+#endif
 #endif
       frame_(NULL),
       revframe_(NULL),
@@ -1915,13 +1921,21 @@ TEST_F(ApmTest, Process) {
           test->set_num_input_channels(kChannels[j]);
           test->set_num_output_channels(kChannels[j]);
           test->set_sample_rate(kProcessSampleRates[l]);
+          test->set_use_aec_extended_filter(false);
         }
       }
     }
+#if defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE)
+    // To test the extended filter mode.
+    audioproc::Test* test = ref_data.add_test();
+    test->set_num_reverse_channels(2);
+    test->set_num_input_channels(2);
+    test->set_num_output_channels(2);
+    test->set_sample_rate(AudioProcessing::kSampleRate32kHz);
+    test->set_use_aec_extended_filter(true);
+#endif
   }
 
-  EnableAllComponents();
-
   for (int i = 0; i < ref_data.test_size(); i++) {
     printf("Running test %d of %d...\n", i + 1, ref_data.test_size());
 
@@ -1931,6 +1945,14 @@ TEST_F(ApmTest, Process) {
     if (test->num_input_channels() != test->num_output_channels())
       continue;
 
+    Config config;
+    config.Set<ExperimentalAgc>(new ExperimentalAgc(false));
+    config.Set<DelayCorrection>(
+        new DelayCorrection(test->use_aec_extended_filter()));
+    apm_.reset(AudioProcessing::Create(config));
+
+    EnableAllComponents();
+
     Init(test->sample_rate(),
          test->sample_rate(),
          test->sample_rate(),
diff --git a/webrtc/modules/audio_processing/test/unittest.proto b/webrtc/modules/audio_processing/test/unittest.proto
index 09ec94224f..47b962b997 100644
--- a/webrtc/modules/audio_processing/test/unittest.proto
+++ b/webrtc/modules/audio_processing/test/unittest.proto
@@ -47,6 +47,7 @@ message Test {
 
   optional float ns_speech_probability_average = 14;
 
+  optional bool use_aec_extended_filter = 15;
 }
 
 message OutputData {