Merge methods for configuring NACK/FEC/hybrid.

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 1720 matching lines @@
   return video_->MaxConfiguredBitrateVideo();
 }
 
 int32_t RTPSender::SendRTPIntraRequest() {
   if (audio_configured_) {
     return -1;
   }
   return video_->SendRTPIntraRequest();
 }
 
-int32_t RTPSender::SetGenericFECStatus(bool enable,
-                                       uint8_t payload_type_red,
-                                       uint8_t payload_type_fec) {
-  if (audio_configured_) {
-    return -1;
-  }
+void RTPSender::SetGenericFECStatus(bool enable,
+                                    uint8_t payload_type_red,
+                                    uint8_t payload_type_fec) {
+  DCHECK(!audio_configured_);
   video_->SetGenericFECStatus(enable, payload_type_red, payload_type_fec);
-  return 0;
 }
 
-int32_t RTPSender::GenericFECStatus(bool* enable,
+void RTPSender::GenericFECStatus(bool* enable,
                                     uint8_t* payload_type_red,
                                     uint8_t* payload_type_fec) const {
-  if (audio_configured_) {
-    return -1;
-  }
+  DCHECK(!audio_configured_);
   video_->GenericFECStatus(*enable, *payload_type_red, *payload_type_fec);
-  return 0;
 }
 
 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 88 matching lines @@
   CriticalSectionScoped lock(send_critsect_.get());
 
   RtpState state;
   state.sequence_number = sequence_number_rtx_;
   state.start_timestamp = start_timestamp_;
 
   return state;
 }
 
 }  // namespace webrtc