Merge methods for configuring NACK/FEC/hybrid.

webrtc/video_engine/vie_channel.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 118 matching lines @@
                                   bool buffered_rendering,
                                   int32_t render_delay);
   int32_t DeRegisterExternalDecoder(const uint8_t pl_type);
   int32_t ReceiveCodecStatistics(uint32_t* num_key_frames,
                                  uint32_t* num_delta_frames);
   uint32_t DiscardedPackets() const;
 
   // Returns the estimated delay in milliseconds.
   int ReceiveDelay() const;
 
-  // If enabled, a key frame request will be sent as soon as there are lost
-  // packets. If |only_key_frames| are set, requests are only sent for loss in
-  // key frames.
-  int32_t SetSignalPacketLossStatus(bool enable, bool only_key_frames);
-
   void SetRTCPMode(const RTCPMethod rtcp_mode);
-  int32_t SetNACKStatus(const bool enable);
-  int32_t SetFECStatus(const bool enable,
-                       const unsigned char payload_typeRED,
-                       const unsigned char payload_typeFEC);
-  int32_t SetHybridNACKFECStatus(const bool enable,
-                                 const unsigned char payload_typeRED,
-                                 const unsigned char payload_typeFEC);
+  void SetProtectionMode(bool enable_nack,
+                         bool enable_fec,
+                         int payload_type_red,
+                         int payload_type_fec);
   bool IsSendingFecEnabled();
   int SetSenderBufferingMode(int target_delay_ms);
   int SetReceiverBufferingMode(int target_delay_ms);
   int32_t SetKeyFrameRequestMethod(const KeyFrameRequestMethod method);
   void EnableRemb(bool enable);
   int SetSendTimestampOffsetStatus(bool enable, int id);
   int SetReceiveTimestampOffsetStatus(bool enable, int id);
   int SetSendAbsoluteSendTimeStatus(bool enable, int id);
   int SetReceiveAbsoluteSendTimeStatus(bool enable, int id);
   int SetSendVideoRotationStatus(bool enable, int id);
@@ skipping 185 matching lines @@
       PacedSender* paced_sender,
       BitrateStatisticsObserver* send_bitrate_observer,
       FrameCountObserver* send_frame_count_observer,
       SendSideDelayObserver* send_side_delay_observer,
       size_t num_modules);
 
   // Assumed to be protected.
   void StartDecodeThread();
   void StopDecodeThread();
 
-  int32_t ProcessNACKRequest(const bool enable);
-  int32_t ProcessFECRequest(const bool enable,
-                            const unsigned char payload_typeRED,
-                            const unsigned char payload_typeFEC);
+  void ProcessNACKRequest(const bool enable);
   // Compute NACK list parameters for the buffering mode.
   int GetRequiredNackListSize(int target_delay_ms);
   void SetRtxSendStatus(bool enable);
 
   void UpdateHistograms();
 
   // ViEChannel exposes methods that allow to modify observers and callbacks
   // to be modified. Such an API-style is cumbersome to implement and maintain
   // at all the levels when comparing to only setting them at construction. As
   // so this class instantiates its children with a wrapper that can be modified
@@ skipping 128 matching lines @@
   const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_;
 
   // RtpRtcp modules, declared last as they use other members on construction.
   const std::vector<RtpRtcp*> rtp_rtcp_modules_;
   size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_