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

Side by Side Diff: media/formats/webm/webm_constants.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
7 7
8 #include "base/basictypes.h" 8 #include <stdint.h>
9
9 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
10 11
11 namespace media { 12 namespace media {
12 13
13 // WebM element IDs. 14 // WebM element IDs.
14 // This is a subset of the IDs in the Matroska spec. 15 // This is a subset of the IDs in the Matroska spec.
15 // http://www.matroska.org/technical/specs/index.html 16 // http://www.matroska.org/technical/specs/index.html
16 const int kWebMIdAESSettingsCipherMode = 0x47E8; 17 const int kWebMIdAESSettingsCipherMode = 0x47E8;
17 const int kWebMIdAlphaMode = 0x53C0; 18 const int kWebMIdAlphaMode = 0x53C0;
18 const int kWebMIdAspectRatioType = 0x54B3; 19 const int kWebMIdAspectRatioType = 0x54B3;
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 const int kWebMIdTrackTranslate = 0x6624; 194 const int kWebMIdTrackTranslate = 0x6624;
194 const int kWebMIdTrackTranslateCodec = 0x66BF; 195 const int kWebMIdTrackTranslateCodec = 0x66BF;
195 const int kWebMIdTrackTranslateEditionUID = 0x66FC; 196 const int kWebMIdTrackTranslateEditionUID = 0x66FC;
196 const int kWebMIdTrackTranslateTrackID = 0x66A5; 197 const int kWebMIdTrackTranslateTrackID = 0x66A5;
197 const int kWebMIdTrackType = 0x83; 198 const int kWebMIdTrackType = 0x83;
198 const int kWebMIdTrackUID = 0x73C5; 199 const int kWebMIdTrackUID = 0x73C5;
199 const int kWebMIdVideo = 0xE0; 200 const int kWebMIdVideo = 0xE0;
200 const int kWebMIdVoid = 0xEC; 201 const int kWebMIdVoid = 0xEC;
201 const int kWebMIdWritingApp = 0x5741; 202 const int kWebMIdWritingApp = 0x5741;
202 203
203 const int64 kWebMReservedId = 0x1FFFFFFF; 204 const int64_t kWebMReservedId = 0x1FFFFFFF;
204 const int64 kWebMUnknownSize = 0x00FFFFFFFFFFFFFFLL; 205 const int64_t kWebMUnknownSize = 0x00FFFFFFFFFFFFFFLL;
205 206
206 const uint8 kWebMFlagKeyframe = 0x80; 207 const uint8_t kWebMFlagKeyframe = 0x80;
207 208
208 // Current encrypted WebM request for comments specification is here 209 // Current encrypted WebM request for comments specification is here
209 // http://wiki.webmproject.org/encryption/webm-encryption-rfc 210 // http://wiki.webmproject.org/encryption/webm-encryption-rfc
210 const uint8 kWebMFlagEncryptedFrame = 0x1; 211 const uint8_t kWebMFlagEncryptedFrame = 0x1;
211 const int kWebMIvSize = 8; 212 const int kWebMIvSize = 8;
212 const int kWebMSignalByteSize = 1; 213 const int kWebMSignalByteSize = 1;
213 214
214 // Current specification for WebVTT embedded in WebM 215 // Current specification for WebVTT embedded in WebM
215 // http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm 216 // http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm
216 217
217 const int kWebMTrackTypeVideo = 1; 218 const int kWebMTrackTypeVideo = 1;
218 const int kWebMTrackTypeAudio = 2; 219 const int kWebMTrackTypeAudio = 2;
219 const int kWebMTrackTypeSubtitlesOrCaptions = 0x11; 220 const int kWebMTrackTypeSubtitlesOrCaptions = 0x11;
220 const int kWebMTrackTypeDescriptionsOrMetadata = 0x21; 221 const int kWebMTrackTypeDescriptionsOrMetadata = 0x21;
221 222
222 MEDIA_EXPORT extern const char kWebMCodecSubtitles[]; 223 MEDIA_EXPORT extern const char kWebMCodecSubtitles[];
223 MEDIA_EXPORT extern const char kWebMCodecCaptions[]; 224 MEDIA_EXPORT extern const char kWebMCodecCaptions[];
224 MEDIA_EXPORT extern const char kWebMCodecDescriptions[]; 225 MEDIA_EXPORT extern const char kWebMCodecDescriptions[];
225 MEDIA_EXPORT extern const char kWebMCodecMetadata[]; 226 MEDIA_EXPORT extern const char kWebMCodecMetadata[];
226 227
227 } // namespace media 228 } // namespace media
228 229
229 #endif // MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_ 230 #endif // MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698