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 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
720 } | 720 } |
721 | 721 |
722 // TODO(mflodman): Base the start bitrate on a current bandwidth estimate, if | 722 // TODO(mflodman): Base the start bitrate on a current bandwidth estimate, if |
723 // the call has already started. | 723 // the call has already started. |
724 // Copy ssrcs from |config| since |config| is moved. | 724 // Copy ssrcs from |config| since |config| is moved. |
725 std::vector<uint32_t> ssrcs = config.rtp.ssrcs; | 725 std::vector<uint32_t> ssrcs = config.rtp.ssrcs; |
726 VideoSendStream* send_stream = new VideoSendStream( | 726 VideoSendStream* send_stream = new VideoSendStream( |
727 num_cpu_cores_, module_process_thread_.get(), &worker_queue_, | 727 num_cpu_cores_, module_process_thread_.get(), &worker_queue_, |
728 call_stats_.get(), transport_send_.get(), bitrate_allocator_.get(), | 728 call_stats_.get(), transport_send_.get(), bitrate_allocator_.get(), |
729 video_send_delay_stats_.get(), event_log_, std::move(config), | 729 video_send_delay_stats_.get(), event_log_, std::move(config), |
730 std::move(encoder_config), suspended_video_send_ssrcs_); | 730 std::move(encoder_config), suspended_video_send_ssrcs_, |
| 731 config_.keepalive_config); |
731 | 732 |
732 { | 733 { |
733 WriteLockScoped write_lock(*send_crit_); | 734 WriteLockScoped write_lock(*send_crit_); |
734 for (uint32_t ssrc : ssrcs) { | 735 for (uint32_t ssrc : ssrcs) { |
735 RTC_DCHECK(video_send_ssrcs_.find(ssrc) == video_send_ssrcs_.end()); | 736 RTC_DCHECK(video_send_ssrcs_.find(ssrc) == video_send_ssrcs_.end()); |
736 video_send_ssrcs_[ssrc] = send_stream; | 737 video_send_ssrcs_[ssrc] = send_stream; |
737 } | 738 } |
738 video_send_streams_.insert(send_stream); | 739 video_send_streams_.insert(send_stream); |
739 } | 740 } |
740 send_stream->SignalNetworkState(video_network_state_); | 741 send_stream->SignalNetworkState(video_network_state_); |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1407 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { | 1408 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { |
1408 receive_side_cc_.OnReceivedPacket( | 1409 receive_side_cc_.OnReceivedPacket( |
1409 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), | 1410 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), |
1410 header); | 1411 header); |
1411 } | 1412 } |
1412 } | 1413 } |
1413 | 1414 |
1414 } // namespace internal | 1415 } // namespace internal |
1415 | 1416 |
1416 } // namespace webrtc | 1417 } // namespace webrtc |
OLD | NEW |