Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 #endif | 64 #endif |
| 65 #ifdef WEBRTC_CODEC_OPUS | 65 #ifdef WEBRTC_CODEC_OPUS |
| 66 kOpus, // Mono and stereo | 66 kOpus, // Mono and stereo |
| 67 #endif | 67 #endif |
| 68 kCNNB, | 68 kCNNB, |
| 69 kCNWB, | 69 kCNWB, |
| 70 kCNSWB, | 70 kCNSWB, |
| 71 #ifdef ENABLE_48000_HZ | 71 #ifdef ENABLE_48000_HZ |
| 72 kCNFB, | 72 kCNFB, |
| 73 #endif | 73 #endif |
| 74 kAVT, | 74 kAVT8kHz, |
| 75 kAVT16kHz, | |
| 76 kAVT32kHz, | |
| 77 kAVT48kHz, | |
| 75 #ifdef WEBRTC_CODEC_RED | 78 #ifdef WEBRTC_CODEC_RED |
| 76 kRED, | 79 kRED, |
| 77 #endif | 80 #endif |
| 78 kNumCodecs, // Implementation detail. Don't use. | 81 kNumCodecs, // Implementation detail. Don't use. |
| 79 | 82 |
| 80 // Set unsupported codecs to -1. | 83 // Set unsupported codecs to -1. |
| 81 #if !defined(WEBRTC_CODEC_ISAC) && !defined(WEBRTC_CODEC_ISACFX) | 84 #if !defined(WEBRTC_CODEC_ISAC) && !defined(WEBRTC_CODEC_ISACFX) |
| 82 kISAC = -1, | 85 kISAC = -1, |
| 83 #endif | 86 #endif |
| 84 #ifndef WEBRTC_CODEC_ISAC | 87 #ifndef WEBRTC_CODEC_ISAC |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 kDecoderPCM16Bswb32kHz, | 122 kDecoderPCM16Bswb32kHz, |
| 120 kDecoderPCM16Bswb48kHz, | 123 kDecoderPCM16Bswb48kHz, |
| 121 kDecoderPCM16B_2ch, | 124 kDecoderPCM16B_2ch, |
| 122 kDecoderPCM16Bwb_2ch, | 125 kDecoderPCM16Bwb_2ch, |
| 123 kDecoderPCM16Bswb32kHz_2ch, | 126 kDecoderPCM16Bswb32kHz_2ch, |
| 124 kDecoderPCM16Bswb48kHz_2ch, | 127 kDecoderPCM16Bswb48kHz_2ch, |
| 125 kDecoderPCM16B_5ch, | 128 kDecoderPCM16B_5ch, |
| 126 kDecoderG722, | 129 kDecoderG722, |
| 127 kDecoderG722_2ch, | 130 kDecoderG722_2ch, |
| 128 kDecoderRED, | 131 kDecoderRED, |
| 129 kDecoderAVT, | 132 kDecoderAVT8kHz, |
|
ossu
2016/10/04 09:26:57
Not sure someone outside uses this one, but maybe
the sun
2016/10/08 22:06:51
I'm leaving kDecoderAVT and kAVT as is then - comp
ossu
2016/10/10 23:26:34
Oh? Silly compiler!
| |
| 133 kDecoderAVT16kHz, | |
| 134 kDecoderAVT32kHz, | |
| 135 kDecoderAVT48kHz, | |
| 130 kDecoderCNGnb, | 136 kDecoderCNGnb, |
| 131 kDecoderCNGwb, | 137 kDecoderCNGwb, |
| 132 kDecoderCNGswb32kHz, | 138 kDecoderCNGswb32kHz, |
| 133 kDecoderCNGswb48kHz, | 139 kDecoderCNGswb48kHz, |
| 134 kDecoderArbitrary, | 140 kDecoderArbitrary, |
| 135 kDecoderOpus, | 141 kDecoderOpus, |
| 136 kDecoderOpus_2ch, | 142 kDecoderOpus_2ch, |
| 137 }; | 143 }; |
| 138 | 144 |
| 139 static rtc::Optional<SdpAudioFormat> NetEqDecoderToSdpAudioFormat( | 145 static rtc::Optional<SdpAudioFormat> NetEqDecoderToSdpAudioFormat( |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 228 std::unique_ptr<AudioEncoder> red_encoder_; | 234 std::unique_ptr<AudioEncoder> red_encoder_; |
| 229 rtc::scoped_refptr<LockedIsacBandwidthInfo> isac_bandwidth_info_; | 235 rtc::scoped_refptr<LockedIsacBandwidthInfo> isac_bandwidth_info_; |
| 230 | 236 |
| 231 RTC_DISALLOW_COPY_AND_ASSIGN(RentACodec); | 237 RTC_DISALLOW_COPY_AND_ASSIGN(RentACodec); |
| 232 }; | 238 }; |
| 233 | 239 |
| 234 } // namespace acm2 | 240 } // namespace acm2 |
| 235 } // namespace webrtc | 241 } // namespace webrtc |
| 236 | 242 |
| 237 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ | 243 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_ |
| OLD | NEW |