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

Side by Side Diff: media/base/cdm_key_information.h

Issue 1354723003: Update MediaKeyStatus enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use right DEPS value Created 5 years, 2 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
OLDNEW
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_RESTRICTED = 3, 21 OUTPUT_RESTRICTED = 3,
22 OUTPUT_DOWNSCALED = 4, 22 OUTPUT_DOWNSCALED = 4,
23 KEY_STATUS_PENDING = 5, 23 KEY_STATUS_PENDING = 5,
24 KEY_STATUS_MAX = KEY_STATUS_PENDING 24 RELEASED = 6,
25 KEY_STATUS_MAX = RELEASED
25 }; 26 };
26 27
27 CdmKeyInformation(); 28 CdmKeyInformation();
28 ~CdmKeyInformation(); 29 ~CdmKeyInformation();
29 30
30 std::vector<uint8> key_id; 31 std::vector<uint8> key_id;
31 KeyStatus status; 32 KeyStatus status;
32 uint32 system_code; 33 uint32 system_code;
33 }; 34 };
34 35
35 } // namespace media 36 } // namespace media
36 37
37 #endif // MEDIA_BASE_CDM_KEY_INFORMATION_H_ 38 #endif // MEDIA_BASE_CDM_KEY_INFORMATION_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | media/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698