webrtc/media/engine/payload_type_mapper.cc - Issue 2845603002: Normalize codec names to those used by AcmCodecDatabase.

Side by Side Diff: webrtc/media/engine/payload_type_mapper.cc

Issue 2845603002: Normalize codec names to those used by AcmCodecDatabase. (Closed)

Patch Set: Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.	2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license	4 * Use of this source code is governed by a BSD-style license

5 * that can be found in the LICENSE file in the root of the source	5 * that can be found in the LICENSE file in the root of the source

6 * tree. An additional intellectual property rights grant can be found	6 * tree. An additional intellectual property rights grant can be found

7 * in the file PATENTS. All contributing project authors may	7 * in the file PATENTS. All contributing project authors may

8 * be found in the AUTHORS file in the root of the source tree.	8 * be found in the AUTHORS file in the root of the source tree.

9 */	9 */

10	10

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 // someone implements an MPEG audio encoder/decoder.	52 // someone implements an MPEG audio encoder/decoder.

53 {{"MPA", 90000, 0}, 14},	53 {{"MPA", 90000, 0}, 14},

54 {{"MPA", 90000, 1}, 14},	54 {{"MPA", 90000, 1}, 14},

55 {{"G728", 8000, 1}, 15},	55 {{"G728", 8000, 1}, 15},

56 {{"DVI4", 11025, 1}, 16},	56 {{"DVI4", 11025, 1}, 16},

57 {{"DVI4", 22050, 1}, 17},	57 {{"DVI4", 22050, 1}, 17},

58 {{"G729", 8000, 1}, 18},	58 {{"G729", 8000, 1}, 18},

59	59

60 // Payload type assignments currently used by WebRTC.	60 // Payload type assignments currently used by WebRTC.

61 // Includes data to reduce collisions (and thus reassignments)	61 // Includes data to reduce collisions (and thus reassignments)

62 // RTX codecs mapping to specific video payload types

63 // Other codecs

64 {{kGoogleRtpDataCodecName, 0, 0}, kGoogleRtpDataCodecPlType},	62 {{kGoogleRtpDataCodecName, 0, 0}, kGoogleRtpDataCodecPlType},

65 {{kIlbcCodecName, 8000, 1}, 102},	63 {{kIlbcCodecName, 8000, 1}, 102},

66 {{kIsacCodecName, 16000, 1}, 103},	64 {{kIsacCodecName, 16000, 1}, 103},

67 {{kIsacCodecName, 32000, 1}, 104},	65 {{kIsacCodecName, 32000, 1}, 104},

68 {{kCnCodecName, 16000, 1}, 105},	66 {{kCnCodecName, 16000, 1}, 105},

69 {{kCnCodecName, 32000, 1}, 106},	67 {{kCnCodecName, 32000, 1}, 106},

70 {{kGoogleSctpDataCodecName, 0, 0}, kGoogleSctpDataCodecPlType},	68 {{kGoogleSctpDataCodecName, 0, 0}, kGoogleSctpDataCodecPlType},

71 {{kOpusCodecName, 48000, 2,	69 {{kOpusCodecName, 48000, 2,

72 {{"minptime", "10"}, {"useinbandfec", "1"}}}, 111},	70 {{"minptime", "10"}, {"useinbandfec", "1"}}}, 111},

73 // TODO(solenberg): Remove the hard coded 16k,32k,48k DTMF once we	71 // TODO(solenberg): Remove the hard coded 16k,32k,48k DTMF once we

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 if (name_cmp == 0)	139 if (name_cmp == 0)

142 return a.parameters < b.parameters;	140 return a.parameters < b.parameters;

143 return name_cmp < 0;	141 return name_cmp < 0;

144 }	142 }

145 return a.num_channels < b.num_channels;	143 return a.num_channels < b.num_channels;

146 }	144 }

147 return a.clockrate_hz < b.clockrate_hz;	145 return a.clockrate_hz < b.clockrate_hz;

148 }	146 }

149	147

150 } // namespace cricket	148 } // namespace cricket

OLD	NEW