Merge methods for configuring NACK/FEC/hybrid.

webrtc/video/video_send_stream.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 129 matching lines @@
       CHECK_EQ(0, vie_channel_->SetSendVideoRotationStatus(true, id));
     } else {
       RTC_NOTREACHED() << "Registering unsupported RTP extension.";
     }
   }
 
   // TODO(pbos): Consider configuring REMB in Call.
   channel_group_->SetChannelRembStatus(true, false, vie_channel_);
 
   // Enable NACK, FEC or both.
-  bool enable_protection_nack = false;
-  bool enable_protection_fec = false;
-  if (config_.rtp.fec.red_payload_type != -1) {
-    enable_protection_fec = true;
-    DCHECK(config_.rtp.fec.ulpfec_payload_type != -1);
-    if (config_.rtp.nack.rtp_history_ms > 0) {
-      enable_protection_nack = true;
-      vie_channel_->SetHybridNACKFECStatus(
-          true, static_cast<unsigned char>(config_.rtp.fec.red_payload_type),
-          static_cast<unsigned char>(config_.rtp.fec.ulpfec_payload_type));
-    } else {
-      vie_channel_->SetFECStatus(
-          true, static_cast<unsigned char>(config_.rtp.fec.red_payload_type),
-          static_cast<unsigned char>(config_.rtp.fec.ulpfec_payload_type));
-    }
-    // TODO(changbin): Should set RTX for RED mapping in RTP sender in future.
-  } else {
-    enable_protection_nack = config_.rtp.nack.rtp_history_ms > 0;
-    vie_channel_->SetNACKStatus(config_.rtp.nack.rtp_history_ms > 0);
-  }
+  const bool enable_protection_nack = config_.rtp.nack.rtp_history_ms > 0;
+  const bool enable_protection_fec = config_.rtp.fec.red_payload_type != -1;
+  // TODO(changbin): Should set RTX for RED mapping in RTP sender in future.
+  vie_channel_->SetProtectionMode(enable_protection_nack, enable_protection_fec,
+                                  config_.rtp.fec.red_payload_type,
+                                  config_.rtp.fec.ulpfec_payload_type);
   vie_encoder_->UpdateProtectionMethod(enable_protection_nack,
-                                      enable_protection_fec);
+                                       enable_protection_fec);
 
   ConfigureSsrcs();
 
   vie_channel_->SetRTCPCName(config_.rtp.c_name.c_str());
 
   input_.reset(new internal::VideoCaptureInput(
       module_process_thread_, vie_encoder_, config_.local_renderer,
       &stats_proxy_, overuse_observer));
 
   // 28 to match packet overhead in ModuleRtpRtcpImpl.
@@ skipping 336 matching lines @@
                                        vie_channel_->IsSendingFecEnabled());
 
   // Restart the media flow
   vie_encoder_->Restart();
 
   return true;
 }
 
 }  // namespace internal
 }  // namespace webrtc