| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_, &transport_adapter_, num_cpu_cores, config)); | 143 channel_id_, &transport_adapter_, num_cpu_cores, config)); |
| 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); | |
| 151 RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff) | 150 RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff) |
| 152 << "A stream should not be configured with RTCP disabled. This value is " | 151 << "A stream should not be configured with RTCP disabled. This value is " |
| 153 "reserved for internal usage."; | 152 "reserved for internal usage."; |
| 154 vie_channel_->SetRTCPMode(config_.rtp.rtcp_mode); | 153 vie_channel_->SetRTCPMode(config_.rtp.rtcp_mode); |
| 155 | 154 |
| 156 RTC_DCHECK(config_.rtp.remote_ssrc != 0); | 155 RTC_DCHECK(config_.rtp.remote_ssrc != 0); |
| 157 // TODO(pbos): What's an appropriate local_ssrc for receive-only streams? | 156 // TODO(pbos): What's an appropriate local_ssrc for receive-only streams? |
| 158 RTC_DCHECK(config_.rtp.local_ssrc != 0); | 157 RTC_DCHECK(config_.rtp.local_ssrc != 0); |
| 159 RTC_DCHECK(config_.rtp.remote_ssrc != config_.rtp.local_ssrc); | 158 RTC_DCHECK(config_.rtp.remote_ssrc != config_.rtp.local_ssrc); |
| 160 | 159 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 return 0; | 326 return 0; |
| 328 } | 327 } |
| 329 | 328 |
| 330 void VideoReceiveStream::SignalNetworkState(NetworkState state) { | 329 void VideoReceiveStream::SignalNetworkState(NetworkState state) { |
| 331 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode | 330 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode |
| 332 : RtcpMode::kOff); | 331 : RtcpMode::kOff); |
| 333 } | 332 } |
| 334 | 333 |
| 335 } // namespace internal | 334 } // namespace internal |
| 336 } // namespace webrtc | 335 } // namespace webrtc |
| OLD | NEW |