Multi frequency DTMF support - receiver side

webrtc/media/engine/payload_type_mapper_unittest.cc

Index: webrtc/media/engine/payload_type_mapper_unittest.cc
diff --git a/webrtc/media/engine/payload_type_mapper_unittest.cc b/webrtc/media/engine/payload_type_mapper_unittest.cc
index 7f94c6e88c7396b293d0805302c501a4a2c1128a..d9249ded9ea2162f4bac00ac529f2f5b895a3a0b 100644
--- a/webrtc/media/engine/payload_type_mapper_unittest.cc
+++ b/webrtc/media/engine/payload_type_mapper_unittest.cc
@@ -80,6 +80,12 @@ TEST_F(PayloadTypeMapperTest, WebRTCPayloadTypes) {
   EXPECT_EQ(kDefaultRtxH264PlType, rtx_mapping(kDefaultH264PlType));
   EXPECT_EQ(kDefaultRtxRedPlType,  rtx_mapping(kDefaultRedPlType));
 
+  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}));
@@ -87,6 +93,11 @@ TEST_F(PayloadTypeMapperTest, WebRTCPayloadTypes) {
   EXPECT_EQ(106, FindMapping({kCnCodecName,   32000, 1}));
   EXPECT_EQ(111, FindMapping({kOpusCodecName, 48000, 2,
         {{"minptime", "10"}, {"useinbandfec", "1"}}}));
+  // TODO(solenberg): Remove 16k, 32k, 48k DTMF checks once these payload types
+  // are dynamically assigned.
+  EXPECT_EQ(110, FindMapping({kDtmfCodecName, 48000, 1}));
+  EXPECT_EQ(112, FindMapping({kDtmfCodecName, 32000, 1}));
+  EXPECT_EQ(113, FindMapping({kDtmfCodecName, 16000, 1}));
   EXPECT_EQ(126, FindMapping({kDtmfCodecName, 8000, 1}));
 }