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