Removed the global limitation of the native sample rates on ARM devices and replaced it with an APM…

webrtc/modules/audio_processing/audio_processing_impl.cc

Index: webrtc/modules/audio_processing/audio_processing_impl.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 3b3a9518b1723497b6e352b6f729e26e096ae2d1..40e39d39b8841edc6e0bdd2e15f58d9445325413 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -63,12 +63,8 @@ namespace webrtc {
 const int AudioProcessing::kNativeSampleRatesHz[] = {
     AudioProcessing::kSampleRate8kHz,
     AudioProcessing::kSampleRate16kHz,
-#ifdef WEBRTC_ARCH_ARM_FAMILY
-    AudioProcessing::kSampleRate32kHz};
-#else
     AudioProcessing::kSampleRate32kHz,
     AudioProcessing::kSampleRate48kHz};
-#endif  // WEBRTC_ARCH_ARM_FAMILY
 const size_t AudioProcessing::kNumNativeSampleRates =
     arraysize(AudioProcessing::kNativeSampleRatesHz);
 const int AudioProcessing::kMaxNativeSampleRateHz = AudioProcessing::
@@ -76,6 +72,15 @@ const int AudioProcessing::kMaxNativeSampleRateHz = AudioProcessing::
 
 namespace {
 
+const int kInternalNativeRates[] = {AudioProcessing::kSampleRate8kHz,
+                                    AudioProcessing::kSampleRate16kHz,
+#ifdef WEBRTC_ARCH_ARM_FAMILY
+                                    AudioProcessing::kSampleRate32kHz};
+#else
+                                    AudioProcessing::kSampleRate32kHz,
+                                    AudioProcessing::kSampleRate48kHz};
+#endif  // WEBRTC_ARCH_ARM_FAMILY
+
 static bool LayoutHasKeyboard(AudioProcessing::ChannelLayout layout) {
   switch (layout) {
     case AudioProcessing::kMono:
@@ -96,12 +101,14 @@ bool is_multi_band(int sample_rate_hz) {
 }
 
 int ClosestHigherNativeRate(int min_proc_rate) {
-  for (int rate : AudioProcessing::kNativeSampleRatesHz) {
+  int max_native_rate = kInternalNativeRates[0];
+  for (int rate : kInternalNativeRates) {
     if (rate >= min_proc_rate) {
       return rate;
     }
+    max_native_rate = rate;
   }
-  return AudioProcessing::kMaxNativeSampleRateHz;
+  return max_native_rate;

[hlundin-webrtc, 2016/08/23 07:41:47]

return kInternalNativeRates[arraysize(kInternalNativeRates) - 1];

And skip the local variable max_native_rate.

 }
 
 }  // namespace