Reland of Stop using hardcoded payload types for video codecs

webrtc/media/engine/payload_type_mapper_unittest.cc

 /*
  *  Copyright (c) 2016 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 42 matching lines @@
   EXPECT_EQ(13, FindMapping({"cn",     8000, 1}));
   EXPECT_EQ(14, FindMapping({"mpa",   90000, 0}));
   EXPECT_EQ(14, FindMapping({"mpa",   90000, 1}));
   EXPECT_EQ(15, FindMapping({"g728",   8000, 1}));
   EXPECT_EQ(16, FindMapping({"dvi4",  11025, 1}));
   EXPECT_EQ(17, FindMapping({"dvi4",  22050, 1}));
   EXPECT_EQ(18, FindMapping({"g729",   8000, 1}));
 }
 
 TEST_F(PayloadTypeMapperTest, WebRTCPayloadTypes) {
-  // Tests that the payload mapper knows about the formats we've been using in
-  // WebRTC, with their hard coded values.
-  auto video_mapping = [this] (const char *name) {
-    return FindMapping({name, kVideoCodecClockrate, 0});
-  };
-  EXPECT_EQ(kDefaultVp8PlType,  video_mapping(kVp8CodecName));
-  EXPECT_EQ(kDefaultVp9PlType,  video_mapping(kVp9CodecName));
-  EXPECT_EQ(kDefaultH264PlType, video_mapping(kH264CodecName));
-  EXPECT_EQ(kDefaultRedPlType,  video_mapping(kRedCodecName));
-  EXPECT_EQ(kDefaultUlpfecType, video_mapping(kUlpfecCodecName));
-  EXPECT_EQ(kDefaultFlexfecPlType, video_mapping(kFlexfecCodecName));
-
-  auto rtx_mapping = [this] (int payload_type) {
-    return FindMapping({kRtxCodecName, kVideoCodecClockrate, 0,
-        {{ kCodecParamAssociatedPayloadType, std::to_string(payload_type)}}});
-  };
-  EXPECT_EQ(kDefaultRtxVp8PlType,  rtx_mapping(kDefaultVp8PlType));
-  EXPECT_EQ(kDefaultRtxVp9PlType,  rtx_mapping(kDefaultVp9PlType));
-  EXPECT_EQ(kDefaultRtxH264ConstrainedBaselinePlType,
-            rtx_mapping(kDefaultH264PlType));
-  EXPECT_EQ(kDefaultRtxRedPlType,  rtx_mapping(kDefaultRedPlType));
-
+  // Tests that the payload mapper knows about the audio and data formats we've
+  // been using in WebRTC, with their hard coded values.
   auto data_mapping = [this] (const char *name) {
     return FindMapping({name, 0, 0});
   };
   EXPECT_EQ(kGoogleRtpDataCodecPlType, data_mapping(kGoogleRtpDataCodecName));
   EXPECT_EQ(kGoogleSctpDataCodecPlType, data_mapping(kGoogleSctpDataCodecName));
 
   EXPECT_EQ(102, FindMapping({kIlbcCodecName,  8000, 1}));
   EXPECT_EQ(103, FindMapping({kIsacCodecName, 16000, 1}));
   EXPECT_EQ(104, FindMapping({kIsacCodecName, 32000, 1}));
   EXPECT_EQ(105, FindMapping({kCnCodecName,   16000, 1}));
@@ skipping 71 matching lines @@
 
     EXPECT_EQ(codec.id, payload_type);
     EXPECT_EQ(codec.name, format.name);
     EXPECT_EQ(codec.clockrate, format.clockrate_hz);
     EXPECT_EQ(codec.channels, format.num_channels);
     EXPECT_EQ(codec.params, format.parameters);
   }
 }
 
 }  // namespace cricket