Support multiple rtx codecs.

webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
index b73666d1af09e8c04d6c40fe71c06d726dc5f3f0..4b9cf1da2fcc60468f6db6d1a028a530d1d980d5 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
@@ -335,47 +335,9 @@ TEST_F(RtpPayloadRegistryTest, MultipleRtxPayloadTypes) {
   // Map two RTX payload types.
   rtp_payload_registry_->SetRtxPayloadType(105, 95);
   rtp_payload_registry_->SetRtxPayloadType(106, 96);
-  rtp_payload_registry_->set_use_rtx_payload_mapping_on_restore(true);
 
   TestRtxPacket(rtp_payload_registry_.get(), 105, 95, true);
   TestRtxPacket(rtp_payload_registry_.get(), 106, 96, true);
-
-  // If the option is off, the map will be ignored.
-  rtp_payload_registry_->set_use_rtx_payload_mapping_on_restore(false);
-  TestRtxPacket(rtp_payload_registry_.get(), 105, 90, true);
-  TestRtxPacket(rtp_payload_registry_.get(), 106, 90, true);
-}
-
-// TODO(holmer): Ignored by default for compatibility with misconfigured RTX
-// streams in Chrome. When that is fixed, remove this.
-TEST_F(RtpPayloadRegistryTest, IgnoresRtxPayloadTypeMappingByDefault) {
-  // Set the incoming payload type to 90.
-  RTPHeader header;
-  header.payloadType = 90;
-  header.ssrc = 1;
-  rtp_payload_registry_->SetIncomingPayloadType(header);
-  rtp_payload_registry_->SetRtxSsrc(100);
-  // Map two RTX payload types.
-  rtp_payload_registry_->SetRtxPayloadType(105, 95);
-  rtp_payload_registry_->SetRtxPayloadType(106, 96);
-
-  TestRtxPacket(rtp_payload_registry_.get(), 105, 90, true);
-  TestRtxPacket(rtp_payload_registry_.get(), 106, 90, true);
-}
-
-TEST_F(RtpPayloadRegistryTest, InferLastReceivedPacketIfPayloadTypeUnknown) {
-  rtp_payload_registry_->SetRtxSsrc(100);
-  // Set the incoming payload type to 90.
-  RTPHeader header;
-  header.payloadType = 90;
-  header.ssrc = 1;
-  rtp_payload_registry_->SetIncomingPayloadType(header);
-  rtp_payload_registry_->SetRtxPayloadType(105, 95);
-  rtp_payload_registry_->set_use_rtx_payload_mapping_on_restore(true);
-  // Mapping respected for known type.
-  TestRtxPacket(rtp_payload_registry_.get(), 105, 95, true);
-  // Mapping ignored for unknown type, even though the option is on.
-  TestRtxPacket(rtp_payload_registry_.get(), 106, 90, true);
 }
 
 TEST_F(RtpPayloadRegistryTest, InvalidRtxConfiguration) {