Multi frequency DTMF support - receiver side

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 64 matching lines @@
   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));
 
+  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}));
   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}));
 }
 
 TEST_F(PayloadTypeMapperTest, ValidDynamicPayloadTypes) {
   // RFC 3551 says:
   // "This profile reserves payload type numbers in the range 96-127
   // exclusively for dynamic assignment.  Applications SHOULD first use
   // values in this range for dynamic payload types.  Those applications
   // which need to define more than 32 dynamic payload types MAY bind
   // codes below 96, in which case it is RECOMMENDED that unassigned
@@ skipping 53 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