Simplify {,Set}UlpfecConfig interface.

webrtc/modules/rtp_rtcp/source/rtp_sender_video.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 41 matching lines @@
                  int64_t capture_time_ms,
                  const uint8_t* payload_data,
                  size_t payload_size,
                  const RTPFragmentationHeader* fragmentation,
                  const RTPVideoHeader* video_header);
 
   int32_t SendRTPIntraRequest();
 
   void SetVideoCodecType(RtpVideoCodecTypes type);
 
-  // FEC
-  void SetUlpfecConfig(bool enabled,
-                       int red_payload_type,
-                       int ulpfec_payload_type);
-
-  void UlpfecConfig(bool* enabled,
-                    int* red_payload_type,
-                    int* ulpfec_payload_type) const;
+  // ULPFEC.
+  void SetUlpfecConfig(int red_payload_type, int ulpfec_payload_type);
+  void UlpfecConfig(int* red_payload_type, int* ulpfec_payload_type) const;
 
   void SetFecParameters(const FecProtectionParams* delta_params,
                         const FecProtectionParams* key_params);
 
   uint32_t VideoBitrateSent() const;
   uint32_t FecOverheadRate() const;
 
   int SelectiveRetransmissions() const;
   void SetSelectiveRetransmissions(uint8_t settings);
 
  private:
   void SendVideoPacket(std::unique_ptr<RtpPacketToSend> packet,
                        StorageType storage);
 
   void SendVideoPacketAsRed(std::unique_ptr<RtpPacketToSend> media_packet,
                             StorageType media_packet_storage,
                             bool protect);
 
+  bool red_enabled() const EXCLUSIVE_LOCKS_REQUIRED(crit_) {
+    return red_payload_type_ >= 0;
+  }
+
+  bool ulpfec_enabled() const EXCLUSIVE_LOCKS_REQUIRED(crit_) {
+    return ulpfec_payload_type_ >= 0;
+  }
+
   RTPSender* const rtp_sender_;
   Clock* const clock_;
 
   // Should never be held when calling out of this class.
   rtc::CriticalSection crit_;
   rtc::SequencedTaskChecker encoder_checker_;
 
   RtpVideoCodecTypes video_type_ = kRtpVideoGeneric;
   int32_t retransmission_settings_ GUARDED_BY(crit_) = kRetransmitBaseLayer;
   VideoRotation last_rotation_ GUARDED_BY(encoder_checker_) = kVideoRotation_0;
 
-  // FEC
-  bool fec_enabled_ GUARDED_BY(crit_) = false;
+  // RED/ULPFEC.
   int red_payload_type_ GUARDED_BY(crit_) = -1;
-  int fec_payload_type_ GUARDED_BY(crit_) = -1;
+  int ulpfec_payload_type_ GUARDED_BY(crit_) = -1;
   FecProtectionParams delta_fec_params_ GUARDED_BY(crit_) = FecProtectionParams{
       0, 1, kFecMaskRandom};
   FecProtectionParams key_fec_params_ GUARDED_BY(crit_) = FecProtectionParams{
       0, 1, kFecMaskRandom};
   ProducerFec producer_fec_ GUARDED_BY(crit_);
 
   rtc::CriticalSection stats_crit_;
   // Bitrate used for FEC payload, RED headers, RTP headers for FEC packets
   // and any padding overhead.
   RateStatistics fec_bitrate_ GUARDED_BY(stats_crit_);
   // Bitrate used for video payload and RTP headers.
   RateStatistics video_bitrate_ GUARDED_BY(stats_crit_);
   OneTimeEvent first_frame_sent_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_