mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
9d2788f745
We update the configuration settings for AGC2. We also update their effects. Now, 'gain_controller2.enable=true' means 'first run Adaptive AGC2; then run AGC2 limiter'. Previously, only the AGC2 limiter was implemented. To run that, one had to set both 'gain_controller2.enable=true' and 'gain_controller2.enable_limiter=true'. This setting also enables adaptive AGC2 in the test tool 'audioproc_f'. Bug: webrtc:7494 Change-Id: I0d5dfe443f2cdc0ecf3aa4054442dab6276d284d Reviewed-on: https://webrtc-review.googlesource.com/64990 Reviewed-by: Sam Zackrisson <saza@webrtc.org> Commit-Queue: Alex Loiko <aleloi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22669}
68 lines
2.4 KiB
C++
68 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2017 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.
|
|
*/
|
|
|
|
#include "modules/audio_processing/gain_controller2.h"
|
|
|
|
#include "modules/audio_processing/audio_buffer.h"
|
|
#include "modules/audio_processing/include/audio_frame_view.h"
|
|
#include "modules/audio_processing/logging/apm_data_dumper.h"
|
|
#include "rtc_base/atomicops.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
int GainController2::instance_count_ = 0;
|
|
|
|
GainController2::GainController2()
|
|
: data_dumper_(
|
|
new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
|
|
fixed_gain_controller_(data_dumper_.get()),
|
|
adaptive_agc_(data_dumper_.get()) {}
|
|
|
|
GainController2::~GainController2() = default;
|
|
|
|
void GainController2::Initialize(int sample_rate_hz) {
|
|
RTC_DCHECK(sample_rate_hz == AudioProcessing::kSampleRate8kHz ||
|
|
sample_rate_hz == AudioProcessing::kSampleRate16kHz ||
|
|
sample_rate_hz == AudioProcessing::kSampleRate32kHz ||
|
|
sample_rate_hz == AudioProcessing::kSampleRate48kHz);
|
|
fixed_gain_controller_.SetSampleRate(sample_rate_hz);
|
|
data_dumper_->InitiateNewSetOfRecordings();
|
|
data_dumper_->DumpRaw("sample_rate_hz", sample_rate_hz);
|
|
}
|
|
|
|
void GainController2::Process(AudioBuffer* audio) {
|
|
AudioFrameView<float> float_frame(audio->channels_f(), audio->num_channels(),
|
|
audio->num_frames());
|
|
adaptive_agc_.Process(float_frame);
|
|
fixed_gain_controller_.Process(float_frame);
|
|
}
|
|
|
|
void GainController2::ApplyConfig(
|
|
const AudioProcessing::Config::GainController2& config) {
|
|
RTC_DCHECK(Validate(config));
|
|
config_ = config;
|
|
fixed_gain_controller_.SetGain(config_.fixed_gain_db);
|
|
}
|
|
|
|
bool GainController2::Validate(
|
|
const AudioProcessing::Config::GainController2& config) {
|
|
return config.fixed_gain_db >= 0.f;
|
|
}
|
|
|
|
std::string GainController2::ToString(
|
|
const AudioProcessing::Config::GainController2& config) {
|
|
std::stringstream ss;
|
|
ss << "{enabled: " << (config.enabled ? "true" : "false") << ", "
|
|
<< "fixed_gain_dB: " << config.fixed_gain_db << "}";
|
|
return ss.str();
|
|
}
|
|
|
|
} // namespace webrtc
|