| Index: 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 0f5b5b2d4f0c6f1446e040b917fb6219361feac3..c646fcb56c22797de18c2cf68d81dd04bfcb36db 100644
|
| --- a/webrtc/modules/audio_mixer/audio_mixer_impl.cc
|
| +++ b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
|
| @@ -145,7 +145,6 @@ AudioMixerImpl::AudioMixerImpl(std::unique_ptr<AudioProcessing> limiter)
|
| time_stamp_(0),
|
| limiter_(std::move(limiter)) {
|
| SetOutputFrequency(kDefaultFrequency);
|
| - thread_checker_.DetachFromThread();
|
| }
|
|
|
| AudioMixerImpl::~AudioMixerImpl() {}
|
| @@ -191,7 +190,7 @@ void AudioMixerImpl::Mix(int sample_rate,
|
| 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);
|
| @@ -231,13 +230,13 @@ void AudioMixerImpl::Mix(int sample_rate,
|
| }
|
|
|
| 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_;
|
| }
|
|
|
| @@ -261,7 +260,7 @@ bool AudioMixerImpl::RemoveSource(Source* audio_source) {
|
| }
|
|
|
| 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;
|
| @@ -311,7 +310,7 @@ AudioFrameList AudioMixerImpl::GetAudioFromSources() {
|
|
|
|
|
| bool AudioMixerImpl::LimitMixedAudio(AudioFrame* mixed_audio) const {
|
| - RTC_DCHECK_RUN_ON(&thread_checker_);
|
| + RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
|
| if (!use_limiter_) {
|
| return true;
|
| }
|
| @@ -341,7 +340,7 @@ bool AudioMixerImpl::LimitMixedAudio(AudioFrame* mixed_audio) const {
|
|
|
| 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 iter = FindSourceInList(audio_source, &audio_source_list_);
|
|
|