Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: webrtc/modules/audio_processing/audio_processing_impl.cc

Issue 1801003002: Removed the dependency on AudioProcessingImpl in GainControlImpl (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/gain_control_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_processing/audio_processing_impl.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 67dcd9004a8a683c9504cafb5668dce9c4cc98d5..32ebb0a7c054401cdfad1946de9800deff7c4f75 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -172,7 +172,7 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
public_submodules_->echo_control_mobile.reset(
new EchoControlMobileImpl(this, &crit_render_, &crit_capture_));
public_submodules_->gain_control.reset(
- new GainControlImpl(this, &crit_capture_, &crit_capture_));
+ new GainControlImpl(&crit_capture_, &crit_capture_));
public_submodules_->high_pass_filter.reset(
new HighPassFilterImpl(&crit_capture_));
public_submodules_->level_estimator.reset(
@@ -718,7 +718,8 @@ int AudioProcessingImpl::ProcessStreamLocked() {
ca->split_bands_const(0)[kBand0To8kHz], ca->num_frames_per_band(),
capture_nonlocked_.split_rate);
}
- RETURN_ON_ERR(public_submodules_->gain_control->ProcessCaptureAudio(ca));
+ RETURN_ON_ERR(public_submodules_->gain_control->ProcessCaptureAudio(
+ ca, echo_cancellation()->stream_has_echo()));
if (synthesis_needed(data_processed)) {
ca->MergeFrequencyBands();
@@ -1221,7 +1222,8 @@ void AudioProcessingImpl::InitializeEchoCanceller() {
}
void AudioProcessingImpl::InitializeGainController() {
- public_submodules_->gain_control->Initialize();
+ public_submodules_->gain_control->Initialize(num_proc_channels(),
+ proc_sample_rate_hz());
}
void AudioProcessingImpl::InitializeEchoControlMobile() {
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/gain_control_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698