OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 #ifdef WEBRTC_CODEC_G722 | 144 #ifdef WEBRTC_CODEC_G722 |
145 // Mono | 145 // Mono |
146 {6, {160, 320, 480, 640, 800, 960}, 0, 2}, | 146 {6, {160, 320, 480, 640, 800, 960}, 0, 2}, |
147 // Stereo | 147 // Stereo |
148 {6, {160, 320, 480, 640, 800, 960}, 0, 2}, | 148 {6, {160, 320, 480, 640, 800, 960}, 0, 2}, |
149 #endif | 149 #endif |
150 #ifdef WEBRTC_CODEC_OPUS | 150 #ifdef WEBRTC_CODEC_OPUS |
151 // Opus supports frames shorter than 10ms, | 151 // Opus supports frames shorter than 10ms, |
152 // but it doesn't help us to use them. | 152 // but it doesn't help us to use them. |
153 // Mono and stereo. | 153 // Mono and stereo. |
| 154 #if WEBRTC_OPUS_SUPPORT_120MS_PTIME |
| 155 {5, {480, 960, 1920, 2880, 5760}, 0, 2}, |
| 156 #else |
154 {4, {480, 960, 1920, 2880}, 0, 2}, | 157 {4, {480, 960, 1920, 2880}, 0, 2}, |
155 #endif | 158 #endif |
| 159 #endif |
156 // Comfort noise for three different sampling frequencies. | 160 // Comfort noise for three different sampling frequencies. |
157 {1, {240}, 240, 1}, | 161 {1, {240}, 240, 1}, |
158 {1, {480}, 480, 1}, | 162 {1, {480}, 480, 1}, |
159 {1, {960}, 960, 1}, | 163 {1, {960}, 960, 1}, |
160 // TODO(solenberg): What is this flag? It is never set in the build files. | 164 // TODO(solenberg): What is this flag? It is never set in the build files. |
161 #ifdef ENABLE_48000_HZ | 165 #ifdef ENABLE_48000_HZ |
162 {1, {1440}, 1440, 1}, | 166 {1, {1440}, 1440, 1}, |
163 #endif | 167 #endif |
164 {1, {240}, 240, 1}, | 168 {1, {240}, 240, 1}, |
165 {1, {240}, 240, 1}, | 169 {1, {240}, 240, 1}, |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 } | 338 } |
335 // Gets codec id number from database for the receiver. | 339 // Gets codec id number from database for the receiver. |
336 int ACMCodecDB::ReceiverCodecNumber(const CodecInst& codec_inst) { | 340 int ACMCodecDB::ReceiverCodecNumber(const CodecInst& codec_inst) { |
337 // Look for a matching codec in the database. | 341 // Look for a matching codec in the database. |
338 return CodecId(codec_inst); | 342 return CodecId(codec_inst); |
339 } | 343 } |
340 | 344 |
341 } // namespace acm2 | 345 } // namespace acm2 |
342 | 346 |
343 } // namespace webrtc | 347 } // namespace webrtc |
OLD | NEW |