| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_ | 5 #ifndef CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_ |
| 6 #define CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_ | 6 #define CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 // supported types but cannot be used to instantiate a MediaKeys object. | 50 // supported types but cannot be used to instantiate a MediaKeys object. |
| 51 // Only one parent key system is currently supported per concrete key system. | 51 // Only one parent key system is currently supported per concrete key system. |
| 52 std::string parent_key_system; | 52 std::string parent_key_system; |
| 53 | 53 |
| 54 // The following indicate how the corresponding CDM should be instantiated. | 54 // The following indicate how the corresponding CDM should be instantiated. |
| 55 bool use_aes_decryptor; | 55 bool use_aes_decryptor; |
| 56 #if defined(ENABLE_PEPPER_CDMS) | 56 #if defined(ENABLE_PEPPER_CDMS) |
| 57 std::string pepper_type; | 57 std::string pepper_type; |
| 58 #elif defined(OS_ANDROID) | 58 #elif defined(OS_ANDROID) |
| 59 std::vector<uint8> uuid; | 59 std::vector<uint8> uuid; |
| 60 // TODO(qinmin): this maybe replaced by a new key_system string. |
| 61 bool video_composition_enabled; |
| 60 #endif | 62 #endif |
| 61 }; | 63 }; |
| 62 | 64 |
| 63 } // namespace content | 65 } // namespace content |
| 64 | 66 |
| 65 #endif // CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_ | 67 #endif // CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_ |
| OLD | NEW |