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

AGC2 new data dumps

Browse Source 
Bug: webrtc:7494
Change-Id: Id288dd426e1c2754805bc548fbffe0eaeaacf3da
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213420
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Jesus de Vicente Pena <devicentepena@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33605}
This commit is contained in:
Alessio Bazzica
2021-03-31 15:16:05 +02:00
committed by Commit Bot
parent 841d74ea80
commit 8aaa604375
6 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/audio_processing/gain_controller2.cc
View File

@ -24,14 +24,13 @@ namespace webrtc {
int GainController2::instance_count_ = 0;
GainController2::GainController2()
: data_dumper_(
new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
: data_dumper_(rtc::AtomicOps::Increment(&instance_count_)),
gain_applier_(/*hard_clip_samples=*/false,
/*initial_gain_factor=*/0.f),
limiter_(static_cast<size_t>(48000), data_dumper_.get(), "Agc2"),
limiter_(static_cast<size_t>(48000), &data_dumper_, "Agc2"),
calls_since_last_limiter_log_(0) {
if (config_.adaptive_digital.enabled) {
adaptive_agc_.reset(new AdaptiveAgc(data_dumper_.get()));
adaptive_agc_ = std::make_unique<AdaptiveAgc>(&data_dumper_);
}
}
@ -43,12 +42,13 @@ void GainController2::Initialize(int sample_rate_hz) {
sample_rate_hz == AudioProcessing::kSampleRate32kHz ||
sample_rate_hz == AudioProcessing::kSampleRate48kHz);
limiter_.SetSampleRate(sample_rate_hz);
data_dumper_->InitiateNewSetOfRecordings();
data_dumper_->DumpRaw("sample_rate_hz", sample_rate_hz);
data_dumper_.InitiateNewSetOfRecordings();
data_dumper_.DumpRaw("sample_rate_hz", sample_rate_hz);
calls_since_last_limiter_log_ = 0;
}
void GainController2::Process(AudioBuffer* audio) {
data_dumper_.DumpRaw("agc2_notified_analog_level", analog_level_);
AudioFrameView<float> float_frame(audio->channels(), audio->num_channels(),
audio->num_frames());
// Apply fixed gain first, then the adaptive one.
@ -90,7 +90,7 @@ void GainController2::ApplyConfig(
}
gain_applier_.SetGainFactor(DbToRatio(config_.fixed_digital.gain_db));
if (config_.adaptive_digital.enabled) {
adaptive_agc_.reset(new AdaptiveAgc(data_dumper_.get(), config_));
adaptive_agc_ = std::make_unique<AdaptiveAgc>(&data_dumper_, config_);
} else {
adaptive_agc_.reset();
}