| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 106 |
| 107 void AudioSendStream::Stop() { | 107 void AudioSendStream::Stop() { |
| 108 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 108 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 109 ScopedVoEInterface<VoEBase> base(voice_engine()); | 109 ScopedVoEInterface<VoEBase> base(voice_engine()); |
| 110 int error = base->StopSend(config_.voe_channel_id); | 110 int error = base->StopSend(config_.voe_channel_id); |
| 111 if (error != 0) { | 111 if (error != 0) { |
| 112 LOG(LS_ERROR) << "AudioSendStream::Stop failed with error: " << error; | 112 LOG(LS_ERROR) << "AudioSendStream::Stop failed with error: " << error; |
| 113 } | 113 } |
| 114 } | 114 } |
| 115 | 115 |
| 116 void AudioSendStream::SignalNetworkState(NetworkState state) { | 116 void AudioSendStream::SignalNetworkState(NetworkState state) {} |
| 117 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | |
| 118 } | |
| 119 | 117 |
| 120 bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { | 118 bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { |
| 121 // TODO(solenberg): Tests call this function on a network thread, libjingle | 119 // TODO(solenberg): Tests call this function on a network thread, libjingle |
| 122 // calls on the worker thread. We should move towards always using a network | 120 // calls on the worker thread. We should move towards always using a network |
| 123 // thread. Then this check can be enabled. | 121 // thread. Then this check can be enabled. |
| 124 // RTC_DCHECK(!thread_checker_.CalledOnValidThread()); | 122 // RTC_DCHECK(!thread_checker_.CalledOnValidThread()); |
| 125 return false; | 123 return false; |
| 126 } | 124 } |
| 127 | 125 |
| 128 bool AudioSendStream::SendTelephoneEvent(int payload_type, int event, | 126 bool AudioSendStream::SendTelephoneEvent(int payload_type, int event, |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 | 220 |
| 223 VoiceEngine* AudioSendStream::voice_engine() const { | 221 VoiceEngine* AudioSendStream::voice_engine() const { |
| 224 internal::AudioState* audio_state = | 222 internal::AudioState* audio_state = |
| 225 static_cast<internal::AudioState*>(audio_state_.get()); | 223 static_cast<internal::AudioState*>(audio_state_.get()); |
| 226 VoiceEngine* voice_engine = audio_state->voice_engine(); | 224 VoiceEngine* voice_engine = audio_state->voice_engine(); |
| 227 RTC_DCHECK(voice_engine); | 225 RTC_DCHECK(voice_engine); |
| 228 return voice_engine; | 226 return voice_engine; |
| 229 } | 227 } |
| 230 } // namespace internal | 228 } // namespace internal |
| 231 } // namespace webrtc | 229 } // namespace webrtc |
| OLD | NEW |