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

Side by Side Diff: components/cdm/renderer/widevine_key_systems.h

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 1 month 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 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_WIDEVINE_KEY_SYSTEMS_H_ 5 #ifndef COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_
6 #define COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_ 6 #define COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "content/public/renderer/key_system_info.h" 10 #include "build/build_config.h"
11 #include "media/base/key_system_info.h"
11 12
12 namespace cdm { 13 namespace cdm {
13 14
14 enum WidevineCdmType { 15 enum WidevineCdmType {
15 WIDEVINE, 16 WIDEVINE,
16 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
17 WIDEVINE_HR_NON_COMPOSITING, 18 WIDEVINE_HR_NON_COMPOSITING,
18 #endif // defined(OS_ANDROID) 19 #endif // defined(OS_ANDROID)
19 }; 20 };
20 21
21 void AddWidevineWithCodecs( 22 void AddWidevineWithCodecs(
22 WidevineCdmType widevine_cdm_type, 23 WidevineCdmType widevine_cdm_type,
23 content::SupportedCodecs supported_codecs, 24 media::SupportedCodecs supported_codecs,
24 std::vector<content::KeySystemInfo>* concrete_key_systems); 25 std::vector<media::KeySystemInfo>* concrete_key_systems);
25 26
26 } // namespace cdm 27 } // namespace cdm
27 28
28 #endif // COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_ 29 #endif // COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_
OLDNEW
« no previous file with comments | « components/cdm/renderer/android_key_systems.cc ('k') | components/cdm/renderer/widevine_key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698