Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/video_coding/main/source/video_receiver.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.
  */
 
+#include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
 #include "webrtc/modules/video_coding/main/source/encoded_frame.h"
 #include "webrtc/modules/video_coding/main/source/jitter_buffer.h"
 #include "webrtc/modules/video_coding/main/source/packet.h"
 #include "webrtc/modules/video_coding/main/source/video_coding_impl.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/trace_event.h"
@@ skipping 159 matching lines @@
 
 // Enable or disable a video protection method.
 // Note: This API should be deprecated, as it does not offer a distinction
 // between the protection method and decoding with or without errors. If such a
 // behavior is desired, use the following API: SetReceiverRobustnessMode.
 int32_t VideoReceiver::SetVideoProtection(VCMVideoProtection videoProtection,
                                           bool enable) {
   // By default, do not decode with errors.
   _receiver.SetDecodeErrorMode(kNoErrors);
   switch (videoProtection) {
-    case kProtectionNack:
-    case kProtectionNackReceiver: {
-      CriticalSectionScoped cs(_receiveCritSect);
-      if (enable) {
-        // Enable NACK and always wait for retransmits.
-        _receiver.SetNackMode(kNack, -1, -1);
-      } else {
-        _receiver.SetNackMode(kNoNack, -1, -1);
-      }
+    case kProtectionNack: {
+      DCHECK(enable);
+      _receiver.SetNackMode(kNack, -1, -1);
       break;
     }
 
     case kProtectionKeyOnLoss: {
       CriticalSectionScoped cs(_receiveCritSect);
       if (enable) {
         _keyRequestMode = kKeyOnLoss;
         _receiver.SetDecodeErrorMode(kWithErrors);
       } else if (_keyRequestMode == kKeyOnLoss) {
         _keyRequestMode = kKeyOnError;  // default mode
@@ skipping 10 matching lines @@
       } else if (_keyRequestMode == kKeyOnKeyLoss) {
         _keyRequestMode = kKeyOnError;  // default mode
       } else {
         return VCM_PARAMETER_ERROR;
       }
       break;
     }
 
     case kProtectionNackFEC: {
       CriticalSectionScoped cs(_receiveCritSect);
-      if (enable) {
-        // Enable hybrid NACK/FEC. Always wait for retransmissions
-        // and don't add extra delay when RTT is above
-        // kLowRttNackMs.
-        _receiver.SetNackMode(kNack, media_optimization::kLowRttNackMs, -1);
-        _receiver.SetDecodeErrorMode(kNoErrors);
-        _receiver.SetDecodeErrorMode(kNoErrors);
-      } else {
-        _receiver.SetNackMode(kNoNack, -1, -1);
-      }
+      DCHECK(enable);
+      _receiver.SetNackMode(kNack, media_optimization::kLowRttNackMs, -1);
+      _receiver.SetDecodeErrorMode(kNoErrors);
       break;
     }
-    case kProtectionNackSender:
     case kProtectionFEC:
-      // Ignore encoder modes.
-      return VCM_OK;
     case kProtectionNone:
-      // TODO(pbos): Implement like sender and remove enable parameter. Ignored
-      // for now.
+      // No receiver-side protection.
+      DCHECK(enable);
+      _receiver.SetNackMode(kNoNack, -1, -1);
+      _receiver.SetDecodeErrorMode(kWithErrors);
       break;
   }
   return VCM_OK;
 }
 
 // Register a receive callback. Will be called whenever there is a new frame
 // ready for rendering.
 int32_t VideoReceiver::RegisterReceiveCallback(
     VCMReceiveCallback* receiveCallback) {
   CriticalSectionScoped cs(_receiveCritSect);
@@ skipping 366 matching lines @@
 }
 
 void VideoReceiver::RegisterPreDecodeImageCallback(
     EncodedImageCallback* observer) {
   CriticalSectionScoped cs(_receiveCritSect);
   pre_decode_image_callback_ = observer;
 }
 
 }  // namespace vcm
 }  // namespace webrtc