| 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 162       nullptr, bitrate_estimator, | 162       nullptr, bitrate_estimator, | 
| 163       channel_group_->GetCallStats()->rtcp_rtt_stats(), channel_group_->pacer(), | 163       channel_group_->GetCallStats()->rtcp_rtt_stats(), channel_group_->pacer(), | 
| 164       channel_group_->packet_router(), 1, false)); | 164       channel_group_->packet_router(), 1, false)); | 
| 165 | 165 | 
| 166   RTC_CHECK(vie_channel_->Init() == 0); | 166   RTC_CHECK(vie_channel_->Init() == 0); | 
| 167 | 167 | 
| 168   // Register the channel to receive stats updates. | 168   // Register the channel to receive stats updates. | 
| 169   channel_group_->GetCallStats()->RegisterStatsObserver( | 169   channel_group_->GetCallStats()->RegisterStatsObserver( | 
| 170       vie_channel_->GetStatsObserver()); | 170       vie_channel_->GetStatsObserver()); | 
| 171 | 171 | 
| 172 |  | 
| 173   // TODO(pbos): This is not fine grained enough... | 172   // TODO(pbos): This is not fine grained enough... | 
| 174   vie_channel_->SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false, | 173   vie_channel_->SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false, | 
| 175                                   -1, -1); | 174                                   -1, -1); | 
| 176   RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff) | 175   RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff) | 
| 177       << "A stream should not be configured with RTCP disabled. This value is " | 176       << "A stream should not be configured with RTCP disabled. This value is " | 
| 178          "reserved for internal usage."; | 177          "reserved for internal usage."; | 
| 179   vie_channel_->SetRTCPMode(config_.rtp.rtcp_mode); | 178   vie_channel_->SetRTCPMode(config_.rtp.rtcp_mode); | 
| 180 | 179 | 
| 181   RTC_DCHECK(config_.rtp.remote_ssrc != 0); | 180   RTC_DCHECK(config_.rtp.remote_ssrc != 0); | 
| 182   // TODO(pbos): What's an appropriate local_ssrc for receive-only streams? | 181   // TODO(pbos): What's an appropriate local_ssrc for receive-only streams? | 
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 365   return 0; | 364   return 0; | 
| 366 } | 365 } | 
| 367 | 366 | 
| 368 void VideoReceiveStream::SignalNetworkState(NetworkState state) { | 367 void VideoReceiveStream::SignalNetworkState(NetworkState state) { | 
| 369   vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode | 368   vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode | 
| 370                                                 : RtcpMode::kOff); | 369                                                 : RtcpMode::kOff); | 
| 371 } | 370 } | 
| 372 | 371 | 
| 373 }  // namespace internal | 372 }  // namespace internal | 
| 374 }  // namespace webrtc | 373 }  // namespace webrtc | 
| OLD | NEW | 
|---|