| 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 int channel_id, | 133 int channel_id, |
| 134 const VideoReceiveStream::Config& config, | 134 const VideoReceiveStream::Config& config, |
| 135 webrtc::VoiceEngine* voice_engine) | 135 webrtc::VoiceEngine* voice_engine) |
| 136 : transport_adapter_(config.rtcp_send_transport), | 136 : transport_adapter_(config.rtcp_send_transport), |
| 137 encoded_frame_proxy_(config.pre_decode_callback), | 137 encoded_frame_proxy_(config.pre_decode_callback), |
| 138 config_(config), | 138 config_(config), |
| 139 clock_(Clock::GetRealTimeClock()), | 139 clock_(Clock::GetRealTimeClock()), |
| 140 channel_group_(channel_group), | 140 channel_group_(channel_group), |
| 141 channel_id_(channel_id) { | 141 channel_id_(channel_id) { |
| 142 RTC_CHECK(channel_group_->CreateReceiveChannel( | 142 RTC_CHECK(channel_group_->CreateReceiveChannel( |
| 143 channel_id_, 0, &transport_adapter_, num_cpu_cores)); | 143 channel_id_, &transport_adapter_, num_cpu_cores)); |
| 144 | 144 |
| 145 vie_channel_ = channel_group_->GetChannel(channel_id_); | 145 vie_channel_ = channel_group_->GetChannel(channel_id_); |
| 146 | 146 |
| 147 // TODO(pbos): This is not fine grained enough... | 147 // TODO(pbos): This is not fine grained enough... |
| 148 vie_channel_->SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false, | 148 vie_channel_->SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false, |
| 149 -1, -1); | 149 -1, -1); |
| 150 vie_channel_->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp); | 150 vie_channel_->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp); |
| 151 SetRtcpMode(config_.rtp.rtcp_mode); | 151 SetRtcpMode(config_.rtp.rtcp_mode); |
| 152 | 152 |
| 153 RTC_DCHECK(config_.rtp.remote_ssrc != 0); | 153 RTC_DCHECK(config_.rtp.remote_ssrc != 0); |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 case newapi::kRtcpCompound: | 336 case newapi::kRtcpCompound: |
| 337 vie_channel_->SetRTCPMode(kRtcpCompound); | 337 vie_channel_->SetRTCPMode(kRtcpCompound); |
| 338 break; | 338 break; |
| 339 case newapi::kRtcpReducedSize: | 339 case newapi::kRtcpReducedSize: |
| 340 vie_channel_->SetRTCPMode(kRtcpNonCompound); | 340 vie_channel_->SetRTCPMode(kRtcpNonCompound); |
| 341 break; | 341 break; |
| 342 } | 342 } |
| 343 } | 343 } |
| 344 } // namespace internal | 344 } // namespace internal |
| 345 } // namespace webrtc | 345 } // namespace webrtc |
| OLD | NEW |