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

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

Issue 227743006: Revert 262147 "Remove all uses of GG_LONGLONG and GG_ULONGLONG." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/media/filters/chunk_demuxer_unittest.cc ('k') | trunk/src/net/base/int128.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 // 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 "base/basictypes.h"
9 #include "media/base/media_export.h" 9 #include "media/base/media_export.h"
10 10
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 const int kWebMIdTrackTranslateCodec = 0x66BF; 194 const int kWebMIdTrackTranslateCodec = 0x66BF;
195 const int kWebMIdTrackTranslateEditionUID = 0x66FC; 195 const int kWebMIdTrackTranslateEditionUID = 0x66FC;
196 const int kWebMIdTrackTranslateTrackID = 0x66A5; 196 const int kWebMIdTrackTranslateTrackID = 0x66A5;
197 const int kWebMIdTrackType = 0x83; 197 const int kWebMIdTrackType = 0x83;
198 const int kWebMIdTrackUID = 0x73C5; 198 const int kWebMIdTrackUID = 0x73C5;
199 const int kWebMIdVideo = 0xE0; 199 const int kWebMIdVideo = 0xE0;
200 const int kWebMIdVoid = 0xEC; 200 const int kWebMIdVoid = 0xEC;
201 const int kWebMIdWritingApp = 0x5741; 201 const int kWebMIdWritingApp = 0x5741;
202 202
203 const int64 kWebMReservedId = 0x1FFFFFFF; 203 const int64 kWebMReservedId = 0x1FFFFFFF;
204 const int64 kWebMUnknownSize = 0x00FFFFFFFFFFFFFFLL; 204 const int64 kWebMUnknownSize = GG_LONGLONG(0x00FFFFFFFFFFFFFF);
205 205
206 const uint8 kWebMFlagKeyframe = 0x80; 206 const uint8 kWebMFlagKeyframe = 0x80;
207 207
208 // Current encrypted WebM request for comments specification is here 208 // Current encrypted WebM request for comments specification is here
209 // http://wiki.webmproject.org/encryption/webm-encryption-rfc 209 // http://wiki.webmproject.org/encryption/webm-encryption-rfc
210 const uint8 kWebMFlagEncryptedFrame = 0x1; 210 const uint8 kWebMFlagEncryptedFrame = 0x1;
211 const int kWebMIvSize = 8; 211 const int kWebMIvSize = 8;
212 const int kWebMSignalByteSize = 1; 212 const int kWebMSignalByteSize = 1;
213 213
214 // Current specification for WebVTT embedded in WebM 214 // Current specification for WebVTT embedded in WebM
215 // http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm 215 // http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm
216 216
217 const int kWebMTrackTypeVideo = 1; 217 const int kWebMTrackTypeVideo = 1;
218 const int kWebMTrackTypeAudio = 2; 218 const int kWebMTrackTypeAudio = 2;
219 const int kWebMTrackTypeSubtitlesOrCaptions = 0x11; 219 const int kWebMTrackTypeSubtitlesOrCaptions = 0x11;
220 const int kWebMTrackTypeDescriptionsOrMetadata = 0x21; 220 const int kWebMTrackTypeDescriptionsOrMetadata = 0x21;
221 221
222 MEDIA_EXPORT extern const char kWebMCodecSubtitles[]; 222 MEDIA_EXPORT extern const char kWebMCodecSubtitles[];
223 MEDIA_EXPORT extern const char kWebMCodecCaptions[]; 223 MEDIA_EXPORT extern const char kWebMCodecCaptions[];
224 MEDIA_EXPORT extern const char kWebMCodecDescriptions[]; 224 MEDIA_EXPORT extern const char kWebMCodecDescriptions[];
225 MEDIA_EXPORT extern const char kWebMCodecMetadata[]; 225 MEDIA_EXPORT extern const char kWebMCodecMetadata[];
226 226
227 } // namespace media 227 } // namespace media
228 228
229 #endif // MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_ 229 #endif // MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
OLDNEW
« no previous file with comments | « trunk/src/media/filters/chunk_demuxer_unittest.cc ('k') | trunk/src/net/base/int128.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698