| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 vie_channel_.reset(new ViEChannel( | 147 vie_channel_.reset(new ViEChannel( |
| 148 num_cpu_cores, config.send_transport, module_process_thread_, | 148 num_cpu_cores, config.send_transport, module_process_thread_, |
| 149 channel_group_->GetRtcpIntraFrameObserver(), | 149 channel_group_->GetRtcpIntraFrameObserver(), |
| 150 channel_group_->GetBitrateController()->CreateRtcpBandwidthObserver(), | 150 channel_group_->GetBitrateController()->CreateRtcpBandwidthObserver(), |
| 151 transport_feedback_observer, | 151 transport_feedback_observer, |
| 152 channel_group_->GetRemoteBitrateEstimator(false), | 152 channel_group_->GetRemoteBitrateEstimator(false), |
| 153 channel_group_->GetCallStats()->rtcp_rtt_stats(), channel_group_->pacer(), | 153 channel_group_->GetCallStats()->rtcp_rtt_stats(), channel_group_->pacer(), |
| 154 channel_group_->packet_router(), ssrcs.size(), true)); | 154 channel_group_->packet_router(), ssrcs.size(), true)); |
| 155 RTC_CHECK(vie_channel_->Init() == 0); | 155 RTC_CHECK(vie_channel_->Init() == 0); |
| 156 | 156 |
| 157 channel_group_->GetCallStats()->RegisterStatsObserver( |
| 158 vie_channel_->GetStatsObserver()); |
| 159 |
| 157 vie_encoder_->StartThreadsAndSetSharedMembers( | 160 vie_encoder_->StartThreadsAndSetSharedMembers( |
| 158 vie_channel_->send_payload_router(), | 161 vie_channel_->send_payload_router(), |
| 159 vie_channel_->vcm_protection_callback()); | 162 vie_channel_->vcm_protection_callback()); |
| 160 | 163 |
| 161 std::vector<uint32_t> first_ssrc(1, ssrcs[0]); | 164 std::vector<uint32_t> first_ssrc(1, ssrcs[0]); |
| 162 vie_encoder_->SetSsrcs(first_ssrc); | 165 vie_encoder_->SetSsrcs(first_ssrc); |
| 163 | 166 |
| 164 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) { | 167 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) { |
| 165 const std::string& extension = config_.rtp.extensions[i].name; | 168 const std::string& extension = config_.rtp.extensions[i].name; |
| 166 int id = config_.rtp.extensions[i].id; | 169 int id = config_.rtp.extensions[i].id; |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 vie_channel_->IsSendingFecEnabled()); | 549 vie_channel_->IsSendingFecEnabled()); |
| 547 | 550 |
| 548 // Restart the media flow | 551 // Restart the media flow |
| 549 vie_encoder_->Restart(); | 552 vie_encoder_->Restart(); |
| 550 | 553 |
| 551 return true; | 554 return true; |
| 552 } | 555 } |
| 553 | 556 |
| 554 } // namespace internal | 557 } // namespace internal |
| 555 } // namespace webrtc | 558 } // namespace webrtc |
| OLD | NEW |