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

Side by Side Diff: webrtc/audio/audio_receive_stream.cc

Issue 2774623006: Let PacketRouter separate send and receive modules. (Closed)
Patch Set: Eliminate std::remove. Created 3 years, 8 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 | « no previous file | webrtc/audio/audio_receive_stream_unittest.cc » ('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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 110 }
111 111
112 AudioReceiveStream::~AudioReceiveStream() { 112 AudioReceiveStream::~AudioReceiveStream() {
113 RTC_DCHECK_RUN_ON(&worker_thread_checker_); 113 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
114 LOG(LS_INFO) << "~AudioReceiveStream: " << config_.ToString(); 114 LOG(LS_INFO) << "~AudioReceiveStream: " << config_.ToString();
115 if (playing_) { 115 if (playing_) {
116 Stop(); 116 Stop();
117 } 117 }
118 channel_proxy_->DisassociateSendChannel(); 118 channel_proxy_->DisassociateSendChannel();
119 channel_proxy_->DeRegisterExternalTransport(); 119 channel_proxy_->DeRegisterExternalTransport();
120 channel_proxy_->ResetCongestionControlObjects(); 120 channel_proxy_->ResetReceiverCongestionControlObjects();
121 channel_proxy_->SetRtcEventLog(nullptr); 121 channel_proxy_->SetRtcEventLog(nullptr);
122 } 122 }
123 123
124 void AudioReceiveStream::Start() { 124 void AudioReceiveStream::Start() {
125 RTC_DCHECK_RUN_ON(&worker_thread_checker_); 125 RTC_DCHECK_RUN_ON(&worker_thread_checker_);
126 if (playing_) { 126 if (playing_) {
127 return; 127 return;
128 } 128 }
129 129
130 int error = SetVoiceEnginePlayout(true); 130 int error = SetVoiceEnginePlayout(true);
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { 328 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) {
329 ScopedVoEInterface<VoEBase> base(voice_engine()); 329 ScopedVoEInterface<VoEBase> base(voice_engine());
330 if (playout) { 330 if (playout) {
331 return base->StartPlayout(config_.voe_channel_id); 331 return base->StartPlayout(config_.voe_channel_id);
332 } else { 332 } else {
333 return base->StopPlayout(config_.voe_channel_id); 333 return base->StopPlayout(config_.voe_channel_id);
334 } 334 }
335 } 335 }
336 } // namespace internal 336 } // namespace internal
337 } // namespace webrtc 337 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_receive_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698