| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 | 110 |
| 111 bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { | 111 bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { |
| 112 // TODO(solenberg): Tests call this function on a network thread, libjingle | 112 // TODO(solenberg): Tests call this function on a network thread, libjingle |
| 113 // calls on the worker thread. We should move towards always using a network | 113 // calls on the worker thread. We should move towards always using a network |
| 114 // thread. Then this check can be enabled. | 114 // thread. Then this check can be enabled. |
| 115 // RTC_DCHECK(!thread_checker_.CalledOnValidThread()); | 115 // RTC_DCHECK(!thread_checker_.CalledOnValidThread()); |
| 116 return false; | 116 return false; |
| 117 } | 117 } |
| 118 | 118 |
| 119 bool AudioSendStream::SendTelephoneEvent(int payload_type, uint8_t event, | 119 bool AudioSendStream::SendTelephoneEvent(int payload_type, uint8_t event, |
| 120 uint32_t duration_ms) { | 120 uint16_t duration_ms) { |
| 121 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 121 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 122 return channel_proxy_->SetSendTelephoneEventPayloadType(payload_type) && | 122 return channel_proxy_->SetSendTelephoneEventPayloadType(payload_type) && |
| 123 channel_proxy_->SendTelephoneEventOutband(event, duration_ms); | 123 channel_proxy_->SendTelephoneEventOutband(event, duration_ms); |
| 124 } | 124 } |
| 125 | 125 |
| 126 webrtc::AudioSendStream::Stats AudioSendStream::GetStats() const { | 126 webrtc::AudioSendStream::Stats AudioSendStream::GetStats() const { |
| 127 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 127 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 128 webrtc::AudioSendStream::Stats stats; | 128 webrtc::AudioSendStream::Stats stats; |
| 129 stats.local_ssrc = config_.rtp.ssrc; | 129 stats.local_ssrc = config_.rtp.ssrc; |
| 130 ScopedVoEInterface<VoEAudioProcessing> processing(voice_engine()); | 130 ScopedVoEInterface<VoEAudioProcessing> processing(voice_engine()); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 | 213 |
| 214 VoiceEngine* AudioSendStream::voice_engine() const { | 214 VoiceEngine* AudioSendStream::voice_engine() const { |
| 215 internal::AudioState* audio_state = | 215 internal::AudioState* audio_state = |
| 216 static_cast<internal::AudioState*>(audio_state_.get()); | 216 static_cast<internal::AudioState*>(audio_state_.get()); |
| 217 VoiceEngine* voice_engine = audio_state->voice_engine(); | 217 VoiceEngine* voice_engine = audio_state->voice_engine(); |
| 218 RTC_DCHECK(voice_engine); | 218 RTC_DCHECK(voice_engine); |
| 219 return voice_engine; | 219 return voice_engine; |
| 220 } | 220 } |
| 221 } // namespace internal | 221 } // namespace internal |
| 222 } // namespace webrtc | 222 } // namespace webrtc |
| OLD | NEW |