Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: webrtc/video/video_receive_stream.cc

Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 channel_group_(channel_group), 137 channel_group_(channel_group),
138 channel_id_(channel_id), 138 channel_id_(channel_id),
139 voe_sync_interface_(nullptr) { 139 voe_sync_interface_(nullptr) {
140 CHECK(channel_group_->CreateReceiveChannel(channel_id_, 0, base_channel_id, 140 CHECK(channel_group_->CreateReceiveChannel(channel_id_, 0, base_channel_id,
141 &transport_adapter_, num_cpu_cores, 141 &transport_adapter_, num_cpu_cores,
142 true)); 142 true));
143 143
144 vie_channel_ = channel_group_->GetChannel(channel_id_); 144 vie_channel_ = channel_group_->GetChannel(channel_id_);
145 145
146 // TODO(pbos): This is not fine grained enough... 146 // TODO(pbos): This is not fine grained enough...
147 vie_channel_->SetNACKStatus(config_.rtp.nack.rtp_history_ms > 0); 147 vie_channel_->SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false,
148 -1, -1);
148 vie_channel_->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp); 149 vie_channel_->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp);
149 SetRtcpMode(config_.rtp.rtcp_mode); 150 SetRtcpMode(config_.rtp.rtcp_mode);
150 151
151 DCHECK(config_.rtp.remote_ssrc != 0); 152 DCHECK(config_.rtp.remote_ssrc != 0);
152 // TODO(pbos): What's an appropriate local_ssrc for receive-only streams? 153 // TODO(pbos): What's an appropriate local_ssrc for receive-only streams?
153 DCHECK(config_.rtp.local_ssrc != 0); 154 DCHECK(config_.rtp.local_ssrc != 0);
154 DCHECK(config_.rtp.remote_ssrc != config_.rtp.local_ssrc); 155 DCHECK(config_.rtp.remote_ssrc != config_.rtp.local_ssrc);
155 156
156 vie_channel_->SetSSRC(config_.rtp.local_ssrc, kViEStreamTypeNormal, 0); 157 vie_channel_->SetSSRC(config_.rtp.local_ssrc, kViEStreamTypeNormal, 0);
157 // TODO(pbos): Support multiple RTX, per video payload. 158 // TODO(pbos): Support multiple RTX, per video payload.
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 case newapi::kRtcpCompound: 333 case newapi::kRtcpCompound:
333 vie_channel_->SetRTCPMode(kRtcpCompound); 334 vie_channel_->SetRTCPMode(kRtcpCompound);
334 break; 335 break;
335 case newapi::kRtcpReducedSize: 336 case newapi::kRtcpReducedSize:
336 vie_channel_->SetRTCPMode(kRtcpNonCompound); 337 vie_channel_->SetRTCPMode(kRtcpNonCompound);
337 break; 338 break;
338 } 339 }
339 } 340 }
340 } // namespace internal 341 } // namespace internal
341 } // namespace webrtc 342 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/main/source/video_sender.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698