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

Side by Side Diff: webrtc/common_types.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
« no previous file with comments | « no previous file | webrtc/modules/media_file/media_file_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 virtual ~TraceCallback() {} 132 virtual ~TraceCallback() {}
133 TraceCallback() {} 133 TraceCallback() {}
134 }; 134 };
135 135
136 enum FileFormats { 136 enum FileFormats {
137 kFileFormatWavFile = 1, 137 kFileFormatWavFile = 1,
138 kFileFormatCompressedFile = 2, 138 kFileFormatCompressedFile = 2,
139 kFileFormatPreencodedFile = 4, 139 kFileFormatPreencodedFile = 4,
140 kFileFormatPcm16kHzFile = 7, 140 kFileFormatPcm16kHzFile = 7,
141 kFileFormatPcm8kHzFile = 8, 141 kFileFormatPcm8kHzFile = 8,
142 kFileFormatPcm32kHzFile = 9, 142 kFileFormatPcm32kHzFile = 9
143 kFileFormatPcm48kHzFile = 10
144 }; 143 };
145 144
146 enum FrameType { 145 enum FrameType {
147 kEmptyFrame = 0, 146 kEmptyFrame = 0,
148 kAudioFrameSpeech = 1, 147 kAudioFrameSpeech = 1,
149 kAudioFrameCN = 2, 148 kAudioFrameCN = 2,
150 kVideoFrameKey = 3, 149 kVideoFrameKey = 3,
151 kVideoFrameDelta = 4, 150 kVideoFrameDelta = 4,
152 }; 151 };
153 152
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 enum class RtcpMode { kOff, kCompound, kReducedSize }; 835 enum class RtcpMode { kOff, kCompound, kReducedSize };
837 836
838 enum NetworkState { 837 enum NetworkState {
839 kNetworkUp, 838 kNetworkUp,
840 kNetworkDown, 839 kNetworkDown,
841 }; 840 };
842 841
843 } // namespace webrtc 842 } // namespace webrtc
844 843
845 #endif // WEBRTC_COMMON_TYPES_H_ 844 #endif // WEBRTC_COMMON_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/media_file/media_file_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698