Support multiple rtx codecs.

webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc

 /*
  *  Copyright (c) 2013 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 317 matching lines @@
 TEST_F(RtpPayloadRegistryTest, MultipleRtxPayloadTypes) {
   // 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);
-  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);
+  TestRtxPacket(rtp_payload_registry_.get(), 106, 96, true);
 }
 
 TEST_F(RtpPayloadRegistryTest, InvalidRtxConfiguration) {
   rtp_payload_registry_->SetRtxSsrc(100);
   // Fails because no mappings exist and the incoming payload type isn't known.
   TestRtxPacket(rtp_payload_registry_.get(), 105, 0, false);
   // Succeeds when the mapping is used, but fails for the implicit fallback.
   rtp_payload_registry_->SetRtxPayloadType(105, 95);
   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, 0, false);
 }
 
 INSTANTIATE_TEST_CASE_P(TestDynamicRange,
                         RtpPayloadRegistryGenericTest,
                         testing::Range(96, 127 + 1));
 
 }  // namespace webrtc