| 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 <stddef.h> |
| 9 #include <stdint.h> |
| 10 |
| 8 #include <string> | 11 #include <string> |
| 9 #include <vector> | 12 #include <vector> |
| 10 | 13 |
| 11 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 12 | 15 |
| 13 namespace media { | 16 namespace media { |
| 14 | 17 |
| 15 struct MEDIA_EXPORT CdmKeyInformation { | 18 struct MEDIA_EXPORT CdmKeyInformation { |
| 16 enum KeyStatus { | 19 enum KeyStatus { |
| 17 USABLE = 0, | 20 USABLE = 0, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 40 ~CdmKeyInformation(); | 43 ~CdmKeyInformation(); |
| 41 | 44 |
| 42 std::vector<uint8_t> key_id; | 45 std::vector<uint8_t> key_id; |
| 43 KeyStatus status; | 46 KeyStatus status; |
| 44 uint32_t system_code; | 47 uint32_t system_code; |
| 45 }; | 48 }; |
| 46 | 49 |
| 47 } // namespace media | 50 } // namespace media |
| 48 | 51 |
| 49 #endif // MEDIA_BASE_CDM_KEY_INFORMATION_H_ | 52 #endif // MEDIA_BASE_CDM_KEY_INFORMATION_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master