admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AgcManagerDirect: Fix the use of use_clipping_predictor_step_

Browse Source 
Evaluate the clipping predictor whenever injected but keep using the
predictions only when allowed.

Bug: webrtc:12774
Change-Id: I9e8930a528d1d514d52b821a28b6c8ad0c3aeb5e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231137
Reviewed-by: Minyue Li <minyue@webrtc.org>
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Commit-Queue: Hanna Silen <silen@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34937}
This commit is contained in:
Hanna Silen 2021-09-07 10:23:07 +02:00 committed by WebRTC LUCI CQ
parent 7b5fca4cf4
commit 0dfd69bf4e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/audio_processing/agc/agc_manager_direct.cc
View File

@ -588,7 +588,7 @@ void AgcManagerDirect::AnalyzePreProcess(const float* const* audio,
const auto step = clipping_predictor_->EstimateClippedLevelStep( const auto step = clipping_predictor_->EstimateClippedLevelStep(
channel, stream_analog_level_, clipped_level_step_, channel, stream_analog_level_, clipped_level_step_,
channel_agcs_[channel]->min_mic_level(), kMaxMicLevel); channel_agcs_[channel]->min_mic_level(), kMaxMicLevel);
if (use_clipping_predictor_step_ && step.has_value()) { if (step.has_value()) {
predicted_step = std::max(predicted_step, step.value()); predicted_step = std::max(predicted_step, step.value());
clipping_predicted = true; clipping_predicted = true;
} }
@ -609,16 +609,20 @@ void AgcManagerDirect::AnalyzePreProcess(const float* const* audio,
clipping_predictor_log_counter_ = 0; clipping_predictor_log_counter_ = 0;
} }
} }
if (clipping_detected || clipping_predicted) { if (clipping_detected) {
int step = clipped_level_step_; RTC_DLOG(LS_INFO) << "[agc] Clipping detected. clipped_ratio="
if (clipping_detected) { << clipped_ratio;
RTC_DLOG(LS_INFO) << "[agc] Clipping detected. clipped_ratio=" }
<< clipped_ratio; int step = clipped_level_step_;
} if (clipping_predicted) {
if (clipping_predicted) { predicted_step = std::max(predicted_step, clipped_level_step_);
step = std::max(predicted_step, clipped_level_step_); RTC_DLOG(LS_INFO) << "[agc] Clipping predicted. step=" << predicted_step;
RTC_DLOG(LS_INFO) << "[agc] Clipping predicted. step=" << step; if (use_clipping_predictor_step_) {
step = predicted_step;
} }
}
if (clipping_detected ||
(clipping_predicted && use_clipping_predictor_step_)) {
for (auto& state_ch : channel_agcs_) { for (auto& state_ch : channel_agcs_) {
state_ch->HandleClipping(step); state_ch->HandleClipping(step);
} }