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

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

Issue 1422013002: Preparational work for an upcoming addition of a threadchecking scheme for APM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@bundling_of_state_CL
Patch Set: Changes in response to user comments Created 5 years, 1 month 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
Index: webrtc/modules/audio_processing/echo_cancellation_impl.cc
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/webrtc/modules/audio_processing/echo_cancellation_impl.cc
index 62040a4703940017a14cdf0593ff4b340b3c916b..abca59f723ecd3835ad38191bdcaa2ab2351fbd9 100644
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc
@@ -58,11 +58,14 @@ AudioProcessing::Error MapError(int err) {
const size_t EchoCancellationImpl::kAllowedValuesOfSamplesPerFrame1;
const size_t EchoCancellationImpl::kAllowedValuesOfSamplesPerFrame2;
-EchoCancellationImpl::EchoCancellationImpl(const AudioProcessing* apm,
- CriticalSectionWrapper* crit)
+EchoCancellationImpl::EchoCancellationImpl(
+ const AudioProcessing* apm,
+ CriticalSectionWrapper* crit,
+ rtc::ThreadChecker* render_thread_checker)
: ProcessingComponent(),
apm_(apm),
crit_(crit),
+ render_thread_checker_(render_thread_checker),
drift_compensation_enabled_(false),
metrics_enabled_(false),
suppression_level_(kModerateSuppression),
@@ -79,6 +82,7 @@ EchoCancellationImpl::EchoCancellationImpl(const AudioProcessing* apm,
EchoCancellationImpl::~EchoCancellationImpl() {}
int EchoCancellationImpl::ProcessRenderAudio(const AudioBuffer* audio) {
+ RTC_DCHECK(render_thread_checker_->CalledOnValidThread());
if (!is_component_enabled()) {
return apm_->kNoError;
}
@@ -439,6 +443,7 @@ int EchoCancellationImpl::ConfigureHandle(void* handle) const {
config.nlpMode = MapSetting(suppression_level_);
config.skewMode = drift_compensation_enabled_;
config.delay_logging = delay_logging_enabled_;
+
hlundin-webrtc 2015/11/05 13:08:55 C-k
peah-webrtc 2015/11/06 07:31:14 Done.
WebRtcAec_enable_extended_filter(
WebRtcAec_aec_core(static_cast<Handle*>(handle)),
extended_filter_enabled_ ? 1 : 0);

Powered by Google App Engine
This is Rietveld 408576698