Preparational work for an upcoming addition of a threadchecking scheme for APM

webrtc/modules/audio_processing/gain_control_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 20 matching lines @@
       return kAgcModeFixedDigital;
   }
   assert(false);
   return -1;
 }
 }  // namespace
 
 const size_t GainControlImpl::kAllowedValuesOfSamplesPerFrame1;
 const size_t GainControlImpl::kAllowedValuesOfSamplesPerFrame2;
 
-GainControlImpl::GainControlImpl(const AudioProcessing* apm,
-                                 CriticalSectionWrapper* crit)
+GainControlImpl::GainControlImpl(
+    const AudioProcessing* apm,
+    CriticalSectionWrapper* crit,
+    const rtc::ThreadChecker* render_thread_checker,
+    const 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),
       limiter_enabled_(true),
       target_level_dbfs_(3),
       compression_gain_db_(9),
       analog_capture_level_(0),
       was_analog_level_set_(false),
       stream_is_saturated_(false),
       render_queue_element_max_size_(0) {
   AllocateRenderQueue();
 }
 
 GainControlImpl::~GainControlImpl() {}
 
 int GainControlImpl::ProcessRenderAudio(AudioBuffer* audio) {
+  RTC_DCHECK(render_thread_checker_->CalledOnValidThread());
   if (!is_component_enabled()) {
     return apm_->kNoError;
   }
 
   assert(audio->num_frames_per_band() <= 160);
 
   render_queue_buffer_.resize(0);
   for (int i = 0; i < num_handles(); i++) {
     Handle* my_handle = static_cast<Handle*>(handle(i));
     int err =
@@ skipping 134 matching lines @@
 
     analog_capture_level_ /= num_handles();
   }
 
   was_analog_level_set_ = false;
   return apm_->kNoError;
 }
 
 // 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
   // places if not needed.
   ReadQueuedRenderData();
 
   CriticalSectionScoped crit_scoped(crit_);
   was_analog_level_set_ = true;
   if (level < minimum_capture_level_ || level > maximum_capture_level_) {
     return apm_->kBadParameterError;
   }
   analog_capture_level_ = level;
 
   return apm_->kNoError;
 }
 
 int GainControlImpl::stream_analog_level() {
+  RTC_DCHECK(capture_thread_checker_->CalledOnValidThread());
   // TODO(ajm): enable this assertion?
   //assert(mode_ == kAdaptiveAnalog);
 
   return analog_capture_level_;
 }
 
 int GainControlImpl::Enable(bool enable) {
   CriticalSectionScoped crit_scoped(crit_);
   return EnableComponent(enable);
 }
@@ skipping 88 matching lines @@
 }
 
 int GainControlImpl::Initialize() {
   int err = ProcessingComponent::Initialize();
   if (err != apm_->kNoError || !is_component_enabled()) {
     return err;
   }
 
   AllocateRenderQueue();
 
   const int n = num_handles();

[hlundin-webrtc, 2015/11/06 07:45:07]

(Effects of rebase.)

[peah-webrtc, 2015/11/06 08:11:47]

Yep. That is the cause

   RTC_CHECK_GE(n, 0) << "Bad number of handles: " << n;
   capture_levels_.assign(n, analog_capture_level_);
   return apm_->kNoError;
 }
 
 void GainControlImpl::AllocateRenderQueue() {
   const size_t max_frame_size = std::max<size_t>(
       kAllowedValuesOfSamplesPerFrame1, kAllowedValuesOfSamplesPerFrame2);
 
   const size_t new_render_queue_element_max_size = std::max<size_t>(
@@ skipping 49 matching lines @@
   return apm_->num_output_channels();
 }
 
 int GainControlImpl::GetHandleError(void* handle) const {
   // The AGC has no get_error() function.
   // (Despite listing errors in its interface...)
   assert(handle != NULL);
   return apm_->kUnspecifiedError;
 }
 }  // namespace webrtc