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

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

Issue 2436033002: Replace AudioConferenceMixer with AudioMixer. (Closed)
Patch Set: Correct struct member names, less code duplication in tests, minor fixes. 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 rtc::CritScope lock(&crit_); 373 rtc::CritScope lock(&crit_);
374 374
375 const auto iter = FindSourceInList(audio_source, &audio_source_list_); 375 const auto iter = FindSourceInList(audio_source, &audio_source_list_);
376 if (iter != audio_source_list_.end()) { 376 if (iter != audio_source_list_.end()) {
377 return (*iter)->is_mixed; 377 return (*iter)->is_mixed;
378 } 378 }
379 379
380 LOG(LS_ERROR) << "Audio source unknown"; 380 LOG(LS_ERROR) << "Audio source unknown";
381 return false; 381 return false;
382 } 382 }
383
384 bool AudioMixerImpl::GetSourcePresenceStatusForTest(
385 AudioMixerImpl::Source* audio_source) const {
386 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
387 rtc::CritScope lock(&crit_);
388
389 const auto iter = FindSourceInList(audio_source, &audio_source_list_);
390 return iter != audio_source_list_.end();
391 }
383 } // namespace webrtc 392 } // namespace webrtc
OLDNEW
« webrtc/audio/audio_transport_proxy.cc ('K') | « webrtc/modules/audio_mixer/audio_mixer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698