zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make 48 kHz maximum rate default for all devices

Browse Source 
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}
This commit is contained in:
Per Åhgren
2021-01-21 23:03:32 +01:00
committed by Commit Bot
parent 6cd4058504
commit 68c225d76d
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/audio_processing/include/audio_processing.cc
View File

@ -57,14 +57,6 @@ std::string GainController2LevelEstimatorToString(
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 @@ constexpr int AudioProcessing::kNativeSampleRatesHz[];
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;

8
modules/audio_processing/include/audio_processing.h
View File

@ -195,13 +195,9 @@ class RTC_EXPORT AudioProcessing : public rtc::RefCountInterface {
// 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