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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/video/vie_channel.cc

Issue 1687303002: Don't send FEC for H.264 with NACK enabled. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: add log warning Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« webrtc/video/video_send_stream_tests.cc ('K') | « webrtc/video/video_send_stream_tests.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/vie_channel.cc
diff --git a/webrtc/video/vie_channel.cc b/webrtc/video/vie_channel.cc
index 532979dda7ed28ff5b73a964fcb7495a7d24ff49..6950f10556f21628f20a9bd47018e435ae76c6c1 100644
--- a/webrtc/video/vie_channel.cc
+++ b/webrtc/video/vie_channel.cc
@@ -424,12 +424,13 @@ void ViEChannel::SetProtectionMode(bool enable_nack,
int payload_type_red,
int payload_type_fec) {
// Validate payload types.
- if (enable_fec) {
+ if (enable_fec || payload_type_red != -1 || payload_type_fec != -1) {
stefan-webrtc 2016/02/12 10:46:27 Shouldn't this be: enable_fec && payload_type_red
pbos-webrtc 2016/02/12 12:00:27 Comment updated.
RTC_DCHECK_GE(payload_type_red, 0);
RTC_DCHECK_GE(payload_type_fec, 0);
RTC_DCHECK_LE(payload_type_red, 127);
RTC_DCHECK_LE(payload_type_fec, 127);
} else {
+ // Payload types unset.
RTC_DCHECK_EQ(payload_type_red, -1);
RTC_DCHECK_EQ(payload_type_fec, -1);
// Set to valid uint8_ts to be castable later without signed overflows.
« webrtc/video/video_send_stream_tests.cc ('K') | « webrtc/video/video_send_stream_tests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698