Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/video_coding/main/source/video_coding_impl.cc

 /*
  *  Copyright (c) 2012 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 150 matching lines @@
     return sender_->RegisterSendStatisticsCallback(sendStats);
   }
 
   int32_t RegisterProtectionCallback(
       VCMProtectionCallback* protection) override {
     return sender_->RegisterProtectionCallback(protection);
   }
 
   int32_t SetVideoProtection(VCMVideoProtection videoProtection,
                              bool enable) override {
-    sender_->SetVideoProtection(enable, videoProtection);
+    // TODO(pbos): Remove enable from receive-side protection modes as well.
+    if (enable)
+      sender_->SetVideoProtection(videoProtection);
     return receiver_->SetVideoProtection(videoProtection, enable);
   }
 
   int32_t AddVideoFrame(const VideoFrame& videoFrame,
                         const VideoContentMetrics* contentMetrics,
                         const CodecSpecificInfo* codecSpecificInfo) override {
     return sender_->AddVideoFrame(
         videoFrame, contentMetrics, codecSpecificInfo);
   }
 
@@ skipping 174 matching lines @@
   return new VideoCodingModuleImpl(clock, event_factory, false, nullptr,
                                    nullptr);
 }
 
 void VideoCodingModule::Destroy(VideoCodingModule* module) {
   if (module != NULL) {
     delete static_cast<VideoCodingModuleImpl*>(module);
   }
 }
 }  // namespace webrtc