| OLD | NEW | 
|    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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  287 void AudioReceiveStream::SetMinimumPlayoutDelay(int delay_ms) { |  287 void AudioReceiveStream::SetMinimumPlayoutDelay(int delay_ms) { | 
|  288   RTC_DCHECK_RUN_ON(&module_process_thread_checker_); |  288   RTC_DCHECK_RUN_ON(&module_process_thread_checker_); | 
|  289   return channel_proxy_->SetMinimumPlayoutDelay(delay_ms); |  289   return channel_proxy_->SetMinimumPlayoutDelay(delay_ms); | 
|  290 } |  290 } | 
|  291  |  291  | 
|  292 void AudioReceiveStream::AssociateSendStream(AudioSendStream* send_stream) { |  292 void AudioReceiveStream::AssociateSendStream(AudioSendStream* send_stream) { | 
|  293   RTC_DCHECK_RUN_ON(&worker_thread_checker_); |  293   RTC_DCHECK_RUN_ON(&worker_thread_checker_); | 
|  294   if (send_stream) { |  294   if (send_stream) { | 
|  295     VoiceEngineImpl* voe_impl = static_cast<VoiceEngineImpl*>(voice_engine()); |  295     VoiceEngineImpl* voe_impl = static_cast<VoiceEngineImpl*>(voice_engine()); | 
|  296     std::unique_ptr<voe::ChannelProxy> send_channel_proxy = |  296     std::unique_ptr<voe::ChannelProxy> send_channel_proxy = | 
|  297         voe_impl->GetChannelProxy(send_stream->config().voe_channel_id); |  297         voe_impl->GetChannelProxy(send_stream->GetConfig().voe_channel_id); | 
|  298     channel_proxy_->AssociateSendChannel(*send_channel_proxy.get()); |  298     channel_proxy_->AssociateSendChannel(*send_channel_proxy.get()); | 
|  299   } else { |  299   } else { | 
|  300     channel_proxy_->DisassociateSendChannel(); |  300     channel_proxy_->DisassociateSendChannel(); | 
|  301   } |  301   } | 
|  302 } |  302 } | 
|  303  |  303  | 
|  304 void AudioReceiveStream::SignalNetworkState(NetworkState state) { |  304 void AudioReceiveStream::SignalNetworkState(NetworkState state) { | 
|  305   RTC_DCHECK_RUN_ON(&worker_thread_checker_); |  305   RTC_DCHECK_RUN_ON(&worker_thread_checker_); | 
|  306 } |  306 } | 
|  307  |  307  | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  341 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { |  341 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { | 
|  342   ScopedVoEInterface<VoEBase> base(voice_engine()); |  342   ScopedVoEInterface<VoEBase> base(voice_engine()); | 
|  343   if (playout) { |  343   if (playout) { | 
|  344     return base->StartPlayout(config_.voe_channel_id); |  344     return base->StartPlayout(config_.voe_channel_id); | 
|  345   } else { |  345   } else { | 
|  346     return base->StopPlayout(config_.voe_channel_id); |  346     return base->StopPlayout(config_.voe_channel_id); | 
|  347   } |  347   } | 
|  348 } |  348 } | 
|  349 }  // namespace internal |  349 }  // namespace internal | 
|  350 }  // namespace webrtc |  350 }  // namespace webrtc | 
| OLD | NEW |