commit 920d30bc743b76d30c6cae7ad4c97af2e6c24e4c
author aleloi <aleloi@webrtc.org> Thu Oct 20 14:23:24 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 20 21:23:30 2016 +0000
tree d8c3a29ef6afd19e320fa082a65dec8d56ba47d3
parent 161a586b457bf58402ac1e2d233988956e329ea8

Replaced thread checker with race checker in AudioMixer.

This change is due to an incorrect understanding of the threading
model in Chrome. The new AudioMixer has a thread checker to ensure
that mixing is always done from a single thread. Mixing is done on the
Audio Output Thread. When run in Chrome, it can change. Even if the thread
changes, there is never more than one audio thread, and mixing is done
sequentially.

The threading checks and variable access checks are replaced with
rtc::RaceChecker counterparts.

NOTRY=True
BUG=webrtc:6346

Review-Url: https://codereview.webrtc.org/2437913003
Cr-Commit-Position: refs/heads/master@{#14712}

webrtc/modules/audio_mixer/audio_mixer_impl.cc

diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.cc b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
index 57fae8c..3fcd3e3 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
@@ -143,7 +143,6 @@
       time_stamp_(0),
       limiter_(std::move(limiter)) {
   SetOutputFrequency(kDefaultFrequency);
-  thread_checker_.DetachFromThread();
 }
 
 AudioMixerImpl::~AudioMixerImpl() {}
@@ -189,7 +188,7 @@
                          size_t number_of_channels,
                          AudioFrame* audio_frame_for_mixing) {
   RTC_DCHECK(number_of_channels == 1 || number_of_channels == 2);
-  RTC_DCHECK_RUN_ON(&thread_checker_);
+  RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
 
   if (OutputFrequency() != sample_rate) {
     SetOutputFrequency(sample_rate);
@@ -229,13 +228,13 @@
 }
 
 void AudioMixerImpl::SetOutputFrequency(int frequency) {
-  RTC_DCHECK_RUN_ON(&thread_checker_);
+  RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
   output_frequency_ = frequency;
   sample_size_ = (output_frequency_ * kFrameDurationInMs) / 1000;
 }
 
 int AudioMixerImpl::OutputFrequency() const {
-  RTC_DCHECK_RUN_ON(&thread_checker_);
+  RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
   return output_frequency_;
 }
 
@@ -259,7 +258,7 @@
 }
 
 AudioFrameList AudioMixerImpl::GetAudioFromSources() {
-  RTC_DCHECK_RUN_ON(&thread_checker_);
+  RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
   AudioFrameList result;
   std::vector<SourceFrame> audio_source_mixing_data_list;
   std::vector<SourceFrame> ramp_list;
@@ -312,7 +311,7 @@
 
 
 bool AudioMixerImpl::LimitMixedAudio(AudioFrame* mixed_audio) const {
-  RTC_DCHECK_RUN_ON(&thread_checker_);
+  RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
   if (!use_limiter_) {
     return true;
   }
@@ -342,7 +341,7 @@
 
 bool AudioMixerImpl::GetAudioSourceMixabilityStatusForTest(
     AudioMixerImpl::Source* audio_source) const {
-  RTC_DCHECK_RUN_ON(&thread_checker_);
+  RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
   rtc::CritScope lock(&crit_);
 
   const auto non_anonymous_iter =