webrtc/video/video_receive_stream.cc - Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: webrtc/video/video_receive_stream.cc

diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc

index 91a37076f320cf4dab9858851d788b464d6d6738..d0c17d649e8f668e6a47d38c45ee44a2c2ee2fc8 100644

--- a/webrtc/video/video_receive_stream.cc

+++ b/webrtc/video/video_receive_stream.cc

@@ -144,7 +144,8 @@ VideoReceiveStream::VideoReceiveStream(int num_cpu_cores,

vie_channel_ = channel_group_->GetChannel(channel_id_);

// TODO(pbos): This is not fine grained enough...

- vie_channel_->SetNACKStatus(config_.rtp.nack.rtp_history_ms > 0);

+ vie_channel_->SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false,

+ -1, -1);

vie_channel_->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp);

SetRtcpMode(config_.rtp.rtcp_mode);