Remove RED/RTX workaround from sender/receiver and VideoEngine2.

webrtc/video/rtp_stream_receiver.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 134 matching lines @@
   // TODO(pbos): Support multiple RTX, per video payload.
   for (const auto& kv : config_.rtp.rtx) {
     RTC_DCHECK(kv.second.ssrc != 0);
     RTC_DCHECK(kv.second.payload_type != 0);
 
     rtp_payload_registry_.SetRtxSsrc(kv.second.ssrc);
     rtp_payload_registry_.SetRtxPayloadType(kv.second.payload_type,
                                             kv.first);
   }
 
-  // If set to true, the RTX payload type mapping supplied in
-  // |SetRtxPayloadType| will be used when restoring RTX packets. Without it,
-  // RTX packets will always be restored to the last non-RTX packet payload type
-  // received.
-  // TODO(holmer): When Chrome no longer depends on this being false by default,
-  // always use the mapping and remove this whole codepath.
-  rtp_payload_registry_.set_use_rtx_payload_mapping_on_restore(
-      config_.rtp.use_rtx_payload_mapping_on_restore);
-
   if (IsFecEnabled()) {
     VideoCodec ulpfec_codec = {};
     ulpfec_codec.codecType = kVideoCodecULPFEC;
     strncpy(ulpfec_codec.plName, "ulpfec", sizeof(ulpfec_codec.plName));
     ulpfec_codec.plType = config_.rtp.ulpfec.ulpfec_payload_type;
     RTC_CHECK(SetReceiveCodec(ulpfec_codec));
+  }
 
+  if (IsRedEnabled()) {
     VideoCodec red_codec = {};
     red_codec.codecType = kVideoCodecRED;
     strncpy(red_codec.plName, "red", sizeof(red_codec.plName));
     red_codec.plType = config_.rtp.ulpfec.red_payload_type;
     RTC_CHECK(SetReceiveCodec(red_codec));
     if (config_.rtp.ulpfec.red_rtx_payload_type != -1) {
       rtp_payload_registry_.SetRtxPayloadType(
           config_.rtp.ulpfec.red_rtx_payload_type,
           config_.rtp.ulpfec.red_payload_type);
     }
-    // TODO(brandtr): It doesn't seem that |rtp_rtcp_| is used for sending any
-    // RTP packets. Investigate if this is the case, and if so, remove this
-    // call, since there are no RTP packets to protect with RED+ULPFEC.
-    rtp_rtcp_->SetUlpfecConfig(config_.rtp.ulpfec.red_payload_type,
-                               config_.rtp.ulpfec.ulpfec_payload_type);
   }
 
   if (config_.rtp.rtcp_xr.receiver_reference_time_report)
     rtp_rtcp_->SetRtcpXrRrtrStatus(true);
 
   // Stats callback for CNAME changes.
   rtp_rtcp_->RegisterRtcpStatisticsCallback(receive_stats_proxy);
 
   process_thread_->RegisterModule(rtp_rtcp_.get());
 }
@@ skipping 136 matching lines @@
   return rtp_rtcp_->RequestKeyFrame();
 }
 
 int32_t RtpStreamReceiver::SliceLossIndicationRequest(
     const uint64_t picture_id) {
   return rtp_rtcp_->SendRTCPSliceLossIndication(
       static_cast<uint8_t>(picture_id));
 }
 
 bool RtpStreamReceiver::IsFecEnabled() const {
-  return config_.rtp.ulpfec.red_payload_type != -1 &&
-         config_.rtp.ulpfec.ulpfec_payload_type != -1;
+  return config_.rtp.ulpfec.ulpfec_payload_type != -1;
+}
+
+bool RtpStreamReceiver::IsRedEnabled() const {
+  return config_.rtp.ulpfec.red_payload_type != -1;
 }
 
 bool RtpStreamReceiver::IsRetransmissionsEnabled() const {
   return config_.rtp.nack.rtp_history_ms > 0;
 }
 
 void RtpStreamReceiver::RequestPacketRetransmit(
     const std::vector<uint16_t>& sequence_numbers) {
   rtp_rtcp_->SendNack(sequence_numbers);
 }
@@ skipping 184 matching lines @@
     const std::string& extension, int id) {
   // One-byte-extension local identifiers are in the range 1-14 inclusive.
   RTC_DCHECK_GE(id, 1);
   RTC_DCHECK_LE(id, 14);
   RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension));
   RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension(
       StringToRtpExtensionType(extension), id));
 }
 
 }  // namespace webrtc