media/webm/webm_constants.h - Issue 10824136: Add support for v0.3 of the encrypted WebM specification. (Revert Fix)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10824136: Add support for v0.3 of the encrypted WebM specification. (Revert Fix) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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

« media/crypto/aes_decryptor_unittest.cc ('K') | « media/webm/webm_cluster_parser.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_WEBM_WEBM_CONSTANTS_H_	5 #ifndef MEDIA_WEBM_WEBM_CONSTANTS_H_

6 #define MEDIA_WEBM_WEBM_CONSTANTS_H_	6 #define MEDIA_WEBM_WEBM_CONSTANTS_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9	9

10 namespace media {	10 namespace media {

(...skipping 184 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
195 const int kWebMIdWritingApp = 0x5741;	195 const int kWebMIdWritingApp = 0x5741;

196	196

197 const int64 kWebMReservedId = 0x1FFFFFFF;	197 const int64 kWebMReservedId = 0x1FFFFFFF;

198 const int64 kWebMUnknownSize = GG_LONGLONG(0x00FFFFFFFFFFFFFF);	198 const int64 kWebMUnknownSize = GG_LONGLONG(0x00FFFFFFFFFFFFFF);

199	199

200 const uint8 kWebMFlagKeyframe = 0x80;	200 const uint8 kWebMFlagKeyframe = 0x80;

201	201

202 // The size is from the WebM encrypted specification. Current encrypted WebM	202 // The size is from the WebM encrypted specification. Current encrypted WebM

203 // request for comments specification is here	203 // request for comments specification is here

204 // http://wiki.webmproject.org/encryption/webm-encryption-rfc	204 // http://wiki.webmproject.org/encryption/webm-encryption-rfc

	205 const uint8 kWebMFlagEncryptedFrame = 0x1;

205 const int kWebMHmacSize = 12;	206 const int kWebMHmacSize = 12;

206	207

207 } // namespace media	208 } // namespace media

208	209

209 #endif // MEDIA_WEBM_WEBM_CONSTANTS_H_	210 #endif // MEDIA_WEBM_WEBM_CONSTANTS_H_

OLD	NEW