Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: webrtc/modules/media_file/media_file_utility.h

Issue 2791453004: Revert of Supporting 48kHz PCM file. (Closed)
Patch Set: Created 3 years, 8 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:
View unified diff | Download patch
OLDNEW
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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 // Identifiers for preencoded files. 221 // Identifiers for preencoded files.
222 enum MediaFileUtility_CodecType 222 enum MediaFileUtility_CodecType
223 { 223 {
224 kCodecNoCodec = 0, 224 kCodecNoCodec = 0,
225 kCodecIsac, 225 kCodecIsac,
226 kCodecIsacSwb, 226 kCodecIsacSwb,
227 kCodecIsacLc, 227 kCodecIsacLc,
228 kCodecL16_8Khz, 228 kCodecL16_8Khz,
229 kCodecL16_16kHz, 229 kCodecL16_16kHz,
230 kCodecL16_32Khz, 230 kCodecL16_32Khz,
231 kCodecL16_48Khz,
232 kCodecPcmu, 231 kCodecPcmu,
233 kCodecPcma, 232 kCodecPcma,
234 kCodecIlbc20Ms, 233 kCodecIlbc20Ms,
235 kCodecIlbc30Ms, 234 kCodecIlbc30Ms,
236 kCodecG722, 235 kCodecG722,
237 kCodecG722_1_32Kbps, 236 kCodecG722_1_32Kbps,
238 kCodecG722_1_24Kbps, 237 kCodecG722_1_24Kbps,
239 kCodecG722_1_16Kbps, 238 kCodecG722_1_16Kbps,
240 kCodecG722_1c_48, 239 kCodecG722_1c_48,
241 kCodecG722_1c_32, 240 kCodecG722_1c_32,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 273
275 // Only reading or writing can be enabled, not both. 274 // Only reading or writing can be enabled, not both.
276 bool _reading; 275 bool _reading;
277 bool _writing; 276 bool _writing;
278 277
279 // Scratch buffer used for turning stereo audio to mono. 278 // Scratch buffer used for turning stereo audio to mono.
280 uint8_t _tempData[WAV_MAX_BUFFER_SIZE]; 279 uint8_t _tempData[WAV_MAX_BUFFER_SIZE];
281 }; 280 };
282 } // namespace webrtc 281 } // namespace webrtc
283 #endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_ 282 #endif // WEBRTC_MODULES_MEDIA_FILE_MEDIA_FILE_UTILITY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/media_file/media_file_impl.cc ('k') | webrtc/modules/media_file/media_file_utility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698