| Index: webrtc/media/engine/payload_type_mapper.cc
|
| diff --git a/webrtc/media/engine/payload_type_mapper.cc b/webrtc/media/engine/payload_type_mapper.cc
|
| index 58eab16eada9de773d250d44ce5a51f54ea2c490..67a22b202540e10e14d7ed9d36dc27a0a4f243a6 100644
|
| --- a/webrtc/media/engine/payload_type_mapper.cc
|
| +++ b/webrtc/media/engine/payload_type_mapper.cc
|
| @@ -53,38 +53,14 @@ PayloadTypeMapper::PayloadTypeMapper()
|
| {{"G729", 8000, 1}, 18},
|
|
|
| // Payload type assignments currently used by WebRTC.
|
| - // Includes video, 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)}}},
|
| - kDefaultRtxH264PlType},
|
| // Other codecs
|
| - {{kVp8CodecName, 90000, 0}, kDefaultVp8PlType},
|
| - {{kVp9CodecName, 90000, 0}, kDefaultVp9PlType},
|
| {{kIlbcCodecName, 8000, 1}, 102},
|
| {{kIsacCodecName, 16000, 1}, 103},
|
| {{kIsacCodecName, 32000, 1}, 104},
|
| {{kCnCodecName, 16000, 1}, 105},
|
| {{kCnCodecName, 32000, 1}, 106},
|
| - {{kH264CodecName, 90000, 0}, kDefaultH264PlType},
|
| {{kOpusCodecName, 48000, 2,
|
| {{"minptime", "10"}, {"useinbandfec", "1"}}}, 111},
|
| - {{kRedCodecName, 90000, 0}, kDefaultRedPlType},
|
| - {{kUlpfecCodecName, 90000, 0}, kDefaultUlpfecType},
|
| - {{kFlexfecCodecName, 90000, 0}, kDefaultFlexfecPlType},
|
| {{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.
|
|
|