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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 } | 118 } |
119 | 119 |
120 bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { | 120 bool AudioSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { |
121 // TODO(solenberg): Tests call this function on a network thread, libjingle | 121 // 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 | 122 // calls on the worker thread. We should move towards always using a network |
123 // thread. Then this check can be enabled. | 123 // thread. Then this check can be enabled. |
124 // RTC_DCHECK(!thread_checker_.CalledOnValidThread()); | 124 // RTC_DCHECK(!thread_checker_.CalledOnValidThread()); |
125 return false; | 125 return false; |
126 } | 126 } |
127 | 127 |
128 bool AudioSendStream::SendTelephoneEvent(int payload_type, uint8_t event, | 128 bool AudioSendStream::SendTelephoneEvent(int payload_type, int event, |
129 uint32_t duration_ms) { | 129 int duration_ms) { |
130 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 130 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
131 return channel_proxy_->SetSendTelephoneEventPayloadType(payload_type) && | 131 return channel_proxy_->SetSendTelephoneEventPayloadType(payload_type) && |
132 channel_proxy_->SendTelephoneEventOutband(event, duration_ms); | 132 channel_proxy_->SendTelephoneEventOutband(event, duration_ms); |
133 } | 133 } |
134 | 134 |
135 webrtc::AudioSendStream::Stats AudioSendStream::GetStats() const { | 135 webrtc::AudioSendStream::Stats AudioSendStream::GetStats() const { |
136 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 136 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
137 webrtc::AudioSendStream::Stats stats; | 137 webrtc::AudioSendStream::Stats stats; |
138 stats.local_ssrc = config_.rtp.ssrc; | 138 stats.local_ssrc = config_.rtp.ssrc; |
139 ScopedVoEInterface<VoEAudioProcessing> processing(voice_engine()); | 139 ScopedVoEInterface<VoEAudioProcessing> processing(voice_engine()); |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 | 222 |
223 VoiceEngine* AudioSendStream::voice_engine() const { | 223 VoiceEngine* AudioSendStream::voice_engine() const { |
224 internal::AudioState* audio_state = | 224 internal::AudioState* audio_state = |
225 static_cast<internal::AudioState*>(audio_state_.get()); | 225 static_cast<internal::AudioState*>(audio_state_.get()); |
226 VoiceEngine* voice_engine = audio_state->voice_engine(); | 226 VoiceEngine* voice_engine = audio_state->voice_engine(); |
227 RTC_DCHECK(voice_engine); | 227 RTC_DCHECK(voice_engine); |
228 return voice_engine; | 228 return voice_engine; |
229 } | 229 } |
230 } // namespace internal | 230 } // namespace internal |
231 } // namespace webrtc | 231 } // namespace webrtc |
OLD | NEW |