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

Unified Diff: webrtc/modules/audio_processing/gain_control_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/gain_control_impl.cc
diff --git a/webrtc/modules/audio_processing/gain_control_impl.cc b/webrtc/modules/audio_processing/gain_control_impl.cc
index db7b8d9b1c48a31581d502cef7704dec447466d5..e0883ebfcaf9728a361cd8e6197c551d8acb2294 100644
--- a/webrtc/modules/audio_processing/gain_control_impl.cc
+++ b/webrtc/modules/audio_processing/gain_control_impl.cc
@@ -39,10 +39,14 @@ const size_t GainControlImpl::kAllowedValuesOfSamplesPerFrame1;
const size_t GainControlImpl::kAllowedValuesOfSamplesPerFrame2;
GainControlImpl::GainControlImpl(const AudioProcessing* apm,
- CriticalSectionWrapper* crit)
+ CriticalSectionWrapper* crit,
+ rtc::ThreadChecker* render_thread_checker,
+ rtc::ThreadChecker* capture_thread_checker)
: ProcessingComponent(),
apm_(apm),
crit_(crit),
+ render_thread_checker_(render_thread_checker),
+ capture_thread_checker_(capture_thread_checker),
mode_(kAdaptiveAnalog),
minimum_capture_level_(0),
maximum_capture_level_(255),
@@ -59,6 +63,7 @@ GainControlImpl::GainControlImpl(const AudioProcessing* apm,
GainControlImpl::~GainControlImpl() {}
int GainControlImpl::ProcessRenderAudio(AudioBuffer* audio) {
+ RTC_DCHECK(render_thread_checker_->CalledOnValidThread());
if (!is_component_enabled()) {
return apm_->kNoError;
}
@@ -213,6 +218,7 @@ int GainControlImpl::ProcessCaptureAudio(AudioBuffer* audio) {
// TODO(ajm): ensure this is called under kAdaptiveAnalog.
int GainControlImpl::set_stream_analog_level(int level) {
+ RTC_DCHECK(capture_thread_checker_->CalledOnValidThread());
// TODO(peah): Verify that this is really needed to do the reading.
// here as well as in ProcessStream. It works since these functions
// are called from the same thread, but it is not nice to do it in two
@@ -230,6 +236,7 @@ int GainControlImpl::set_stream_analog_level(int level) {
}
int GainControlImpl::stream_analog_level() {
+ RTC_DCHECK(capture_thread_checker_->CalledOnValidThread());
// TODO(ajm): enable this assertion?
//assert(mode_ == kAdaptiveAnalog);

Powered by Google App Engine
This is Rietveld 408576698