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

Side by Side Diff: audio/audio_receive_stream.cc

Issue 3015553002: Remove voe::OutputMixer and AudioConferenceMixer. (Closed)
Patch Set: remove conference mixer from presubmit.py Created 3 years, 3 months 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
« no previous file with comments | « PRESUBMIT.py ('k') | modules/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 int sample_rate_hz, 240 int sample_rate_hz,
241 AudioFrame* audio_frame) { 241 AudioFrame* audio_frame) {
242 return channel_proxy_->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); 242 return channel_proxy_->GetAudioFrameWithInfo(sample_rate_hz, audio_frame);
243 } 243 }
244 244
245 int AudioReceiveStream::Ssrc() const { 245 int AudioReceiveStream::Ssrc() const {
246 return config_.rtp.remote_ssrc; 246 return config_.rtp.remote_ssrc;
247 } 247 }
248 248
249 int AudioReceiveStream::PreferredSampleRate() const { 249 int AudioReceiveStream::PreferredSampleRate() const {
250 return channel_proxy_->NeededFrequency(); 250 return channel_proxy_->PreferredSampleRate();
251 } 251 }
252 252
253 int AudioReceiveStream::id() const { 253 int AudioReceiveStream::id() const {
254 RTC_DCHECK_RUN_ON(&worker_thread_checker_); 254 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
255 return config_.rtp.remote_ssrc; 255 return config_.rtp.remote_ssrc;
256 } 256 }
257 257
258 rtc::Optional<Syncable::Info> AudioReceiveStream::GetInfo() const { 258 rtc::Optional<Syncable::Info> AudioReceiveStream::GetInfo() const {
259 RTC_DCHECK_RUN_ON(&module_process_thread_checker_); 259 RTC_DCHECK_RUN_ON(&module_process_thread_checker_);
260 Syncable::Info info; 260 Syncable::Info info;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { 345 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) {
346 ScopedVoEInterface<VoEBase> base(voice_engine()); 346 ScopedVoEInterface<VoEBase> base(voice_engine());
347 if (playout) { 347 if (playout) {
348 return base->StartPlayout(config_.voe_channel_id); 348 return base->StartPlayout(config_.voe_channel_id);
349 } else { 349 } else {
350 return base->StopPlayout(config_.voe_channel_id); 350 return base->StopPlayout(config_.voe_channel_id);
351 } 351 }
352 } 352 }
353 } // namespace internal 353 } // namespace internal
354 } // namespace webrtc 354 } // namespace webrtc
OLDNEW
« no previous file with comments | « PRESUBMIT.py ('k') | modules/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698