commit 8aaa604375a92d6ab41e70dae340a1fb92c6d62e
author Alessio Bazzica <alessiob@webrtc.org> Wed Mar 31 15:16:05 2021 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Mar 31 14:55:42 2021 +0000
tree 10a443dfe210b4f70bad5f5aa01745f605d7d16d
parent 841d74ea80f79bc8dca83fb4a091a21c34798bc8

AGC2 new data dumps

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}

modules/audio_processing/gain_controller2.cc

diff --git a/modules/audio_processing/gain_controller2.cc b/modules/audio_processing/gain_controller2.cc
index 4477065..bdb223b 100644
--- a/modules/audio_processing/gain_controller2.cc
+++ b/modules/audio_processing/gain_controller2.cc
@@ -24,14 +24,13 @@
 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 @@
              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 @@
   }
   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();
   }