OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 // TODO(solenberg): Some test cases in EndToEndTest use this from a different | 196 // TODO(solenberg): Some test cases in EndToEndTest use this from a different |
197 // thread. Re-enable once that is fixed. | 197 // thread. Re-enable once that is fixed. |
198 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); | 198 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); |
199 return this; | 199 return this; |
200 } | 200 } |
201 | 201 |
202 webrtc::AudioSendStream* Call::CreateAudioSendStream( | 202 webrtc::AudioSendStream* Call::CreateAudioSendStream( |
203 const webrtc::AudioSendStream::Config& config) { | 203 const webrtc::AudioSendStream::Config& config) { |
204 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream"); | 204 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream"); |
205 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); | 205 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); |
206 AudioSendStream* send_stream = new AudioSendStream(config); | 206 AudioSendStream* send_stream = |
| 207 new AudioSendStream(config, config_.voice_engine); |
207 { | 208 { |
208 rtc::CritScope lock(&network_enabled_crit_); | 209 rtc::CritScope lock(&network_enabled_crit_); |
209 WriteLockScoped write_lock(*send_crit_); | 210 WriteLockScoped write_lock(*send_crit_); |
210 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) == | 211 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) == |
211 audio_send_ssrcs_.end()); | 212 audio_send_ssrcs_.end()); |
212 audio_send_ssrcs_[config.rtp.ssrc] = send_stream; | 213 audio_send_ssrcs_[config.rtp.ssrc] = send_stream; |
213 | 214 |
214 if (!network_enabled_) | 215 if (!network_enabled_) |
215 send_stream->SignalNetworkState(kNetworkDown); | 216 send_stream->SignalNetworkState(kNetworkDown); |
216 } | 217 } |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 // thread. Then this check can be enabled. | 607 // thread. Then this check can be enabled. |
607 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); | 608 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); |
608 if (RtpHeaderParser::IsRtcp(packet, length)) | 609 if (RtpHeaderParser::IsRtcp(packet, length)) |
609 return DeliverRtcp(media_type, packet, length); | 610 return DeliverRtcp(media_type, packet, length); |
610 | 611 |
611 return DeliverRtp(media_type, packet, length, packet_time); | 612 return DeliverRtp(media_type, packet, length, packet_time); |
612 } | 613 } |
613 | 614 |
614 } // namespace internal | 615 } // namespace internal |
615 } // namespace webrtc | 616 } // namespace webrtc |
OLD | NEW |