Dont always downsample to 16kHz in the reverse stream in APM

webrtc/modules/audio_processing/test/audio_processing_unittest.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 2623 matching lines @@
       fclose(ref_file);
     }
   }
 }
 
 #if defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE)
 INSTANTIATE_TEST_CASE_P(
     CommonFormats,
     AudioProcessingTest,
     testing::Values(std::tr1::make_tuple(48000, 48000, 48000, 48000, 0, 0),
-                    std::tr1::make_tuple(48000, 48000, 32000, 48000, 40, 30),
-                    std::tr1::make_tuple(48000, 48000, 16000, 48000, 40, 20),
+                    std::tr1::make_tuple(48000, 48000, 32000, 48000, 35, 30),
+                    std::tr1::make_tuple(48000, 48000, 16000, 48000, 35, 20),
                     std::tr1::make_tuple(48000, 44100, 48000, 44100, 20, 20),
                     std::tr1::make_tuple(48000, 44100, 32000, 44100, 20, 15),
                     std::tr1::make_tuple(48000, 44100, 16000, 44100, 20, 15),
                     std::tr1::make_tuple(48000, 32000, 48000, 32000, 30, 35),
                     std::tr1::make_tuple(48000, 32000, 32000, 32000, 30, 0),
                     std::tr1::make_tuple(48000, 32000, 16000, 32000, 30, 20),
                     std::tr1::make_tuple(48000, 16000, 48000, 16000, 25, 20),
                     std::tr1::make_tuple(48000, 16000, 32000, 16000, 25, 20),
                     std::tr1::make_tuple(48000, 16000, 16000, 16000, 25, 0),
 
@@ skipping 26 matching lines @@
                     std::tr1::make_tuple(16000, 48000, 48000, 48000, 25, 0),
                     std::tr1::make_tuple(16000, 48000, 32000, 48000, 25, 30),
                     std::tr1::make_tuple(16000, 48000, 16000, 48000, 25, 20),
                     std::tr1::make_tuple(16000, 44100, 48000, 44100, 15, 20),
                     std::tr1::make_tuple(16000, 44100, 32000, 44100, 15, 15),
                     std::tr1::make_tuple(16000, 44100, 16000, 44100, 15, 15),
                     std::tr1::make_tuple(16000, 32000, 48000, 32000, 25, 35),
                     std::tr1::make_tuple(16000, 32000, 32000, 32000, 25, 0),
                     std::tr1::make_tuple(16000, 32000, 16000, 32000, 25, 20),
                     std::tr1::make_tuple(16000, 16000, 48000, 16000, 40, 20),
-                    std::tr1::make_tuple(16000, 16000, 32000, 16000, 50, 20),
+                    std::tr1::make_tuple(16000, 16000, 32000, 16000, 40, 20),
                     std::tr1::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
 
 #elif defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)
 INSTANTIATE_TEST_CASE_P(
     CommonFormats,
     AudioProcessingTest,
     testing::Values(std::tr1::make_tuple(48000, 48000, 48000, 48000, 0, 0),
-                    std::tr1::make_tuple(48000, 48000, 32000, 48000, 40, 30),
+                    std::tr1::make_tuple(48000, 48000, 32000, 48000, 35, 30),
                     std::tr1::make_tuple(48000, 48000, 16000, 48000, 40, 20),
                     std::tr1::make_tuple(48000, 44100, 48000, 44100, 25, 20),
                     std::tr1::make_tuple(48000, 44100, 32000, 44100, 25, 15),
                     std::tr1::make_tuple(48000, 44100, 16000, 44100, 25, 15),
                     std::tr1::make_tuple(48000, 32000, 48000, 32000, 20, 35),
                     std::tr1::make_tuple(48000, 32000, 32000, 32000, 20, 0),
                     std::tr1::make_tuple(48000, 32000, 16000, 32000, 20, 20),
                     std::tr1::make_tuple(48000, 16000, 48000, 16000, 20, 20),
                     std::tr1::make_tuple(48000, 16000, 32000, 16000, 20, 20),
                     std::tr1::make_tuple(48000, 16000, 16000, 16000, 20, 0),
@@ skipping 27 matching lines @@
                     std::tr1::make_tuple(16000, 48000, 48000, 48000, 25, 0),
                     std::tr1::make_tuple(16000, 48000, 32000, 48000, 25, 30),
                     std::tr1::make_tuple(16000, 48000, 16000, 48000, 25, 20),
                     std::tr1::make_tuple(16000, 44100, 48000, 44100, 15, 20),
                     std::tr1::make_tuple(16000, 44100, 32000, 44100, 15, 15),
                     std::tr1::make_tuple(16000, 44100, 16000, 44100, 15, 15),
                     std::tr1::make_tuple(16000, 32000, 48000, 32000, 25, 35),
                     std::tr1::make_tuple(16000, 32000, 32000, 32000, 25, 0),
                     std::tr1::make_tuple(16000, 32000, 16000, 32000, 25, 20),
                     std::tr1::make_tuple(16000, 16000, 48000, 16000, 35, 20),
-                    std::tr1::make_tuple(16000, 16000, 32000, 16000, 40, 20),
+                    std::tr1::make_tuple(16000, 16000, 32000, 16000, 35, 20),
                     std::tr1::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
 #endif
 
 }  // namespace
 }  // namespace webrtc