media/base/cdm_key_information.h - Issue 850183002: media: Support unprefixed EME API on Android.

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/base/cdm_key_information.h

Issue 850183002: media: Support unprefixed EME API on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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_BASE_CDM_KEY_INFORMATION_H_	5 #ifndef MEDIA_BASE_CDM_KEY_INFORMATION_H_

6 #define MEDIA_BASE_CDM_KEY_INFORMATION_H_	6 #define MEDIA_BASE_CDM_KEY_INFORMATION_H_

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

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

12 #include "media/base/media_export.h"	12 #include "media/base/media_export.h"

13	13

14 namespace media {	14 namespace media {

15	15

16 struct MEDIA_EXPORT CdmKeyInformation {	16 struct MEDIA_EXPORT CdmKeyInformation {

17 enum KeyStatus {	17 enum KeyStatus {

18 USABLE = 0,	18 USABLE = 0,

19 INTERNAL_ERROR = 1,	19 INTERNAL_ERROR = 1,

20 EXPIRED = 2,	20 EXPIRED = 2,

21 OUTPUT_NOT_ALLOWED = 3	21 OUTPUT_NOT_ALLOWED = 3,

	22 KEY_STATUS_MAX = OUTPUT_NOT_ALLOWED

22 };	23 };

23	24

24 CdmKeyInformation();	25 CdmKeyInformation();

25 ~CdmKeyInformation();	26 ~CdmKeyInformation();

26	27

27 std::vector<uint8> key_id;	28 std::vector<uint8> key_id;

28 KeyStatus status;	29 KeyStatus status;

29 uint32 system_code;	30 uint32 system_code;

30 };	31 };

31	32

32 } // namespace media	33 } // namespace media

33	34

34 #endif // MEDIA_BASE_CDM_KEY_INFORMATION_H_	35 #endif // MEDIA_BASE_CDM_KEY_INFORMATION_H_

OLD	NEW

« content/renderer/media/crypto/proxy_media_keys.cc ('K') | « media/base/browser_cdm_factory.cc ('k') | media/base/cdm_promise_adapter.cc » ('j') | media/base/media_keys.h » ('J')