| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_ | 5 #ifndef COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_ |
| 6 #define COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_ | 6 #define COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <vector> | 9 #include <vector> |
| 9 | 10 |
| 10 #include "media/base/key_system_info.h" | 11 #include "media/base/key_system_properties.h" |
| 11 | 12 |
| 12 namespace cdm { | 13 namespace cdm { |
| 13 | 14 |
| 14 void AddAndroidWidevine( | 15 void AddAndroidWidevine( |
| 15 std::vector<media::KeySystemInfo>* concrete_key_systems); | 16 std::vector<std::unique_ptr<media::KeySystemProperties>>* |
| 17 concrete_key_systems); |
| 16 | 18 |
| 17 // Add platform-supported key systems which are not explicitly handled | 19 // Add platform-supported key systems which are not explicitly handled |
| 18 // by Chrome. | 20 // by Chrome. |
| 19 void AddAndroidPlatformKeySystems( | 21 void AddAndroidPlatformKeySystems( |
| 20 std::vector<media::KeySystemInfo>* concrete_key_systems); | 22 std::vector<std::unique_ptr<media::KeySystemProperties>>* |
| 23 concrete_key_systems); |
| 21 | 24 |
| 22 } // namespace cdm | 25 } // namespace cdm |
| 23 | 26 |
| 24 #endif // COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_ | 27 #endif // COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1927953004:
Reland of "Convert Widevine and Android platform key systems to KeySystemProperties" with fix (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master