Rename {,Set}GenericFECStatus to {,Set}UlpfecConfig.

webrtc/modules/rtp_rtcp/source/rtp_sender.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 772 matching lines @@
 
   if (rtp_stats_callback_)
     rtp_stats_callback_->DataCountersUpdated(*counters, packet.Ssrc());
 }
 
 bool RTPSender::IsFecPacket(const RtpPacketToSend& packet) const {
   if (!video_) {
     return false;
   }
   bool fec_enabled;
-  uint8_t pt_red;
-  uint8_t pt_fec;
-  video_->GenericFECStatus(&fec_enabled, &pt_red, &pt_fec);
-  return fec_enabled && packet.PayloadType() == pt_red &&
-         packet.payload()[0] == pt_fec;
+  int pt_red;
+  int pt_fec;
+  video_->UlpfecConfig(&fec_enabled, &pt_red, &pt_fec);
+  return fec_enabled && static_cast<int>(packet.PayloadType()) == pt_red &&
+         static_cast<int>(packet.payload()[0]) == pt_fec;
 }
 
 size_t RTPSender::TimeToSendPadding(size_t bytes, int probe_cluster_id) {
   if (audio_configured_ || bytes == 0)
     return 0;
   size_t bytes_sent = TrySendRedundantPayloads(bytes, probe_cluster_id);
   if (bytes_sent < bytes)
     bytes_sent += SendPadData(bytes - bytes_sent, probe_cluster_id);
   return bytes_sent;
 }
@@ skipping 316 matching lines @@
 
 int32_t RTPSender::SetAudioLevel(uint8_t level_d_bov) {
   return audio_->SetAudioLevel(level_d_bov);
 }
 
 RtpVideoCodecTypes RTPSender::VideoCodecType() const {
   assert(!audio_configured_ && "Sender is an audio stream!");
   return video_->VideoCodecType();
 }
 
-void RTPSender::SetGenericFECStatus(bool enable,
-                                    uint8_t payload_type_red,
-                                    uint8_t payload_type_fec) {
+void RTPSender::SetUlpfecConfig(bool enabled,
+                                int red_payload_type,
+                                int ulpfec_payload_type) {
   RTC_DCHECK(!audio_configured_);
-  video_->SetGenericFECStatus(enable, payload_type_red, payload_type_fec);
-}
-
-void RTPSender::GenericFECStatus(bool* enable,
-                                 uint8_t* payload_type_red,
-                                 uint8_t* payload_type_fec) const {
-  RTC_DCHECK(!audio_configured_);
-  video_->GenericFECStatus(enable, payload_type_red, payload_type_fec);
+  video_->SetUlpfecConfig(enabled, red_payload_type, ulpfec_payload_type);
 }
 
 int32_t RTPSender::SetFecParameters(
     const FecProtectionParams *delta_params,
     const FecProtectionParams *key_params) {
   if (audio_configured_) {
     return -1;
   }
   video_->SetFecParameters(delta_params, key_params);
   return 0;
@@ skipping 91 matching lines @@
   rtc::CritScope lock(&send_critsect_);
 
   RtpState state;
   state.sequence_number = sequence_number_rtx_;
   state.start_timestamp = timestamp_offset_;
 
   return state;
 }
 
 }  // namespace webrtc