Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/video_coding/main/source/video_sender.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 278 matching lines @@
 // Note: this callback is assumed to only be registered once and before it is
 // used in this class.
 int32_t VideoSender::RegisterProtectionCallback(
     VCMProtectionCallback* protection_callback) {
   DCHECK(protection_callback == nullptr || protection_callback_ == nullptr);
   protection_callback_ = protection_callback;
   return VCM_OK;
 }
 
 // Enable or disable a video protection method.
-void VideoSender::SetVideoProtection(bool enable,
-                                     VCMVideoProtection videoProtection) {
+void VideoSender::SetVideoProtection(VCMVideoProtection videoProtection) {
   CriticalSectionScoped cs(_sendCritSect);
   switch (videoProtection) {
     case kProtectionNone:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNone);
+      _mediaOpt.SetProtectionMethod(media_optimization::kNone);
       break;
     case kProtectionNack:
-    case kProtectionNackSender:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNack);
+      _mediaOpt.SetProtectionMethod(media_optimization::kNack);
       break;
     case kProtectionNackFEC:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNackFec);
+      _mediaOpt.SetProtectionMethod(media_optimization::kNackFec);
       break;
     case kProtectionFEC:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kFec);
+      _mediaOpt.SetProtectionMethod(media_optimization::kFec);
       break;
-    case kProtectionNackReceiver:
     case kProtectionKeyOnLoss:
     case kProtectionKeyOnKeyLoss:
       // Ignore receiver modes.
       return;
   }
 }
 // Add one raw video frame to the encoder, blocking.
 int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame,
                                    const VideoContentMetrics* contentMetrics,
                                    const CodecSpecificInfo* codecSpecificInfo) {
@@ skipping 78 matching lines @@
   int window_bps = std::max(threshold_bps / 10, 10000);
   _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps);
 }
 
 bool VideoSender::VideoSuspended() const {
   CriticalSectionScoped cs(_sendCritSect);
   return _mediaOpt.IsVideoSuspended();
 }
 }  // namespace vcm
 }  // namespace webrtc