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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 RTC_DCHECK(num_deleted == 1); | 329 RTC_DCHECK(num_deleted == 1); |
330 } | 330 } |
331 delete audio_send_stream; | 331 delete audio_send_stream; |
332 } | 332 } |
333 | 333 |
334 webrtc::AudioReceiveStream* Call::CreateAudioReceiveStream( | 334 webrtc::AudioReceiveStream* Call::CreateAudioReceiveStream( |
335 const webrtc::AudioReceiveStream::Config& config) { | 335 const webrtc::AudioReceiveStream::Config& config) { |
336 TRACE_EVENT0("webrtc", "Call::CreateAudioReceiveStream"); | 336 TRACE_EVENT0("webrtc", "Call::CreateAudioReceiveStream"); |
337 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); | 337 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); |
338 AudioReceiveStream* receive_stream = new AudioReceiveStream( | 338 AudioReceiveStream* receive_stream = new AudioReceiveStream( |
339 congestion_controller_->GetRemoteBitrateEstimator(false), config, | 339 congestion_controller_.get(), config, config_.audio_state); |
340 config_.audio_state); | |
341 { | 340 { |
342 WriteLockScoped write_lock(*receive_crit_); | 341 WriteLockScoped write_lock(*receive_crit_); |
343 RTC_DCHECK(audio_receive_ssrcs_.find(config.rtp.remote_ssrc) == | 342 RTC_DCHECK(audio_receive_ssrcs_.find(config.rtp.remote_ssrc) == |
344 audio_receive_ssrcs_.end()); | 343 audio_receive_ssrcs_.end()); |
345 audio_receive_ssrcs_[config.rtp.remote_ssrc] = receive_stream; | 344 audio_receive_ssrcs_[config.rtp.remote_ssrc] = receive_stream; |
346 ConfigureSync(config.sync_group); | 345 ConfigureSync(config.sync_group); |
347 } | 346 } |
348 return receive_stream; | 347 return receive_stream; |
349 } | 348 } |
350 | 349 |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
737 // thread. Then this check can be enabled. | 736 // thread. Then this check can be enabled. |
738 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); | 737 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); |
739 if (RtpHeaderParser::IsRtcp(packet, length)) | 738 if (RtpHeaderParser::IsRtcp(packet, length)) |
740 return DeliverRtcp(media_type, packet, length); | 739 return DeliverRtcp(media_type, packet, length); |
741 | 740 |
742 return DeliverRtp(media_type, packet, length, packet_time); | 741 return DeliverRtp(media_type, packet, length, packet_time); |
743 } | 742 } |
744 | 743 |
745 } // namespace internal | 744 } // namespace internal |
746 } // namespace webrtc | 745 } // namespace webrtc |
OLD | NEW |