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

Side by Side Diff: webrtc/modules/audio_mixer/audio_mixer_impl.cc

Issue 2436033002: Replace AudioConferenceMixer with AudioMixer. (Closed)
Patch Set: New ReceiveStream test and no fixture in AudioPath test. Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 rtc::CritScope lock(&crit_); 374 rtc::CritScope lock(&crit_);
375 375
376 const auto iter = FindSourceInList(audio_source, &audio_source_list_); 376 const auto iter = FindSourceInList(audio_source, &audio_source_list_);
377 if (iter != audio_source_list_.end()) { 377 if (iter != audio_source_list_.end()) {
378 return (*iter)->is_mixed; 378 return (*iter)->is_mixed;
379 } 379 }
380 380
381 LOG(LS_ERROR) << "Audio source unknown"; 381 LOG(LS_ERROR) << "Audio source unknown";
382 return false; 382 return false;
383 } 383 }
384
385 bool AudioMixerImpl::GetSourcePresenceStatusForTest(
386 AudioMixerImpl::Source* audio_source) const {
387 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
388 rtc::CritScope lock(&crit_);
389
390 const auto iter = FindSourceInList(audio_source, &audio_source_list_);
391 return iter != audio_source_list_.end();
392 }
384 } // namespace webrtc 393 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698