Multi frequency DTMF support - receiver side

webrtc/media/engine/payload_type_mapper.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 35 matching lines @@
           // and 1 here, to increase the chances it will be correctly used if
           // someone implements an MPEG audio encoder/decoder.
           {{"MPA",   90000, 0}, 14},
           {{"MPA",   90000, 1}, 14},
           {{"G728",   8000, 1}, 15},
           {{"DVI4",  11025, 1}, 16},
           {{"DVI4",  22050, 1}, 17},
           {{"G729",   8000, 1}, 18},
 
           // Payload type assignments currently used by WebRTC.
-          // Includes video, to reduce collisions (and thus reassignments)
+          // Includes video and data to reduce collisions (and thus
+          // reassignments).
           // RTX codecs mapping to specific video payload types
           {{kRtxCodecName,    90000, 0,
               {{kCodecParamAssociatedPayloadType,
                       std::to_string(kDefaultVp8PlType)}}},
                 kDefaultRtxVp8PlType},
           {{kRtxCodecName,    90000, 0,
               {{kCodecParamAssociatedPayloadType,
                       std::to_string(kDefaultVp9PlType)}}},
                 kDefaultRtxVp9PlType},
           {{kRtxCodecName,    90000, 0,
               {{kCodecParamAssociatedPayloadType,
                       std::to_string(kDefaultRedPlType)}}},
                 kDefaultRtxRedPlType},
           {{kRtxCodecName,    90000, 0,
               {{kCodecParamAssociatedPayloadType,
                       std::to_string(kDefaultH264PlType)}}},
                 kDefaultRtxH264ConstrainedBaselinePlType},
           // Other codecs
           {{kVp8CodecName,    90000, 0}, kDefaultVp8PlType},
           {{kVp9CodecName,    90000, 0}, kDefaultVp9PlType},
+          {{kGoogleRtpDataCodecName, 0, 0}, kGoogleRtpDataCodecPlType},
           {{kIlbcCodecName,    8000, 1}, 102},
           {{kIsacCodecName,   16000, 1}, 103},
           {{kIsacCodecName,   32000, 1}, 104},
           {{kCnCodecName,     16000, 1}, 105},
           {{kCnCodecName,     32000, 1}, 106},
           {{kH264CodecName,   90000, 0}, kDefaultH264PlType},
+          {{kGoogleSctpDataCodecName, 0, 0}, kGoogleSctpDataCodecPlType},
           {{kOpusCodecName,   48000, 2,
               {{"minptime", "10"}, {"useinbandfec", "1"}}}, 111},
           {{kRedCodecName,    90000, 0}, kDefaultRedPlType},
           {{kUlpfecCodecName, 90000, 0}, kDefaultUlpfecType},
           {{kFlexfecCodecName, 90000, 0}, kDefaultFlexfecPlType},
+          // TODO(solenberg): Remove the hard coded 16k,32k,48k DTMF once we
+          // assign payload types dynamically for send side as well.
+          {{kDtmfCodecName,   48000, 1}, 110},
+          {{kDtmfCodecName,   32000, 1}, 112},
+          {{kDtmfCodecName,   16000, 1}, 113},
           {{kDtmfCodecName,    8000, 1}, 126}}) {
   // TODO(ossu): Try to keep this as change-proof as possible until we're able
   // to remove the payload type constants from everywhere in the code.
   for (const auto& mapping : mappings_) {
     used_payload_types_.insert(mapping.second);
   }
 }
 
 PayloadTypeMapper::~PayloadTypeMapper() = default;
 
@@ skipping 53 matching lines @@
       if (name_cmp == 0)
         return a.parameters < b.parameters;
       return name_cmp < 0;
     }
     return a.num_channels < b.num_channels;
   }
   return a.clockrate_hz < b.clockrate_hz;
 }
 
 }  // namespace cricket