Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/video_coding/main/source/media_optimization.h

 /*
  *  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 44 matching lines @@
   //          min_bit_rate - the bit rate of the end-point with lowest rate.
   //          max_bit_rate - the bit rate of the end-point with highest rate.
   // TODO(andresp): Find if the callbacks can be triggered only after releasing
   // an internal critical section.
   uint32_t SetTargetRates(uint32_t target_bitrate,
                           uint8_t fraction_lost,
                           int64_t round_trip_time_ms,
                           VCMProtectionCallback* protection_callback,
                           VCMQMSettingsCallback* qmsettings_callback);
 
-  void EnableProtectionMethod(bool enable, VCMProtectionMethodEnum method);
+  void SetProtectionMethod(VCMProtectionMethodEnum method);
   void EnableQM(bool enable);
   void EnableFrameDropper(bool enable);
 
   // Lets the sender suspend video when the rate drops below
   // |threshold_bps|, and turns back on when the rate goes back up above
   // |threshold_bps| + |window_bps|.
   void SuspendBelowMinBitrate(int threshold_bps, int window_bps);
   bool IsVideoSuspended() const;
 
   bool DropFrame();
@@ skipping 96 matching lines @@
   int num_layers_ GUARDED_BY(crit_sect_);
   bool suspension_enabled_ GUARDED_BY(crit_sect_);
   bool video_suspended_ GUARDED_BY(crit_sect_);
   int suspension_threshold_bps_ GUARDED_BY(crit_sect_);
   int suspension_window_bps_ GUARDED_BY(crit_sect_);
 };
 }  // namespace media_optimization
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_MEDIA_OPTIMIZATION_H_