Make 48 kHz maximum rate default for all devices Bug: b/169918549 Change-Id: I2f4b7ced5ae6efcae3cd59c0a42610a54f5e2dc7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203260 Reviewed-by: Sam Zackrisson <saza@webrtc.org> Commit-Queue: Per Åhgren <peah@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33192}
diff --git a/modules/audio_processing/include/audio_processing.cc b/modules/audio_processing/include/audio_processing.cc index 4af9b2f..e30ba69 100644 --- a/modules/audio_processing/include/audio_processing.cc +++ b/modules/audio_processing/include/audio_processing.cc
@@ -57,14 +57,6 @@ RTC_CHECK_NOTREACHED(); } -int GetDefaultMaxInternalRate() { -#ifdef WEBRTC_ARCH_ARM_FAMILY - return 32000; -#else - return 48000; -#endif -} - } // namespace constexpr int AudioProcessing::kNativeSampleRatesHz[]; @@ -72,9 +64,6 @@ void CustomProcessing::SetRuntimeSetting( AudioProcessing::RuntimeSetting setting) {} -AudioProcessing::Config::Pipeline::Pipeline() - : maximum_internal_processing_rate(GetDefaultMaxInternalRate()) {} - bool Agc1Config::operator==(const Agc1Config& rhs) const { const auto& analog_lhs = analog_gain_controller; const auto& analog_rhs = rhs.analog_gain_controller;
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 1070a56..785a2b1 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h
@@ -195,13 +195,9 @@ // Sets the properties of the audio processing pipeline. struct RTC_EXPORT Pipeline { - Pipeline(); - // Maximum allowed processing rate used internally. May only be set to - // 32000 or 48000 and any differing values will be treated as 48000. The - // default rate is currently selected based on the CPU architecture, but - // that logic may change. - int maximum_internal_processing_rate; + // 32000 or 48000 and any differing values will be treated as 48000. + int maximum_internal_processing_rate = 48000; // Allow multi-channel processing of render audio. bool multi_channel_render = false; // Allow multi-channel processing of capture audio when AEC3 is active