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

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

Issue 1106263004: Support Android secure codecs in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include build_config.h. Created 5 years, 7 months 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 "build/build_config.h" 10 #include "build/build_config.h"
11 #include "media/base/key_system_info.h" 11 #include "media/base/key_system_info.h"
12 12
13 namespace cdm { 13 namespace cdm {
14 14
15 enum WidevineCdmType { 15 enum WidevineCdmType {
16 WIDEVINE, 16 WIDEVINE,
17 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
18 WIDEVINE_HR_NON_COMPOSITING, 18 WIDEVINE_HR_NON_COMPOSITING,
19 #endif // defined(OS_ANDROID) 19 #endif // defined(OS_ANDROID)
20 }; 20 };
21 21
22 void AddWidevineWithCodecs( 22 void AddWidevineWithCodecs(
23 WidevineCdmType widevine_cdm_type, 23 WidevineCdmType widevine_cdm_type,
24 media::SupportedCodecs supported_codecs, 24 media::SupportedCodecs supported_codecs,
25 #if defined(OS_ANDROID)
26 media::SupportedCodecs supported_secure_codecs,
27 #endif // defined(OS_ANDROID)
25 media::EmeRobustness max_audio_robustness, 28 media::EmeRobustness max_audio_robustness,
26 media::EmeRobustness max_video_robustness, 29 media::EmeRobustness max_video_robustness,
27 media::EmeSessionTypeSupport persistent_license_support, 30 media::EmeSessionTypeSupport persistent_license_support,
28 media::EmeSessionTypeSupport persistent_release_message_support, 31 media::EmeSessionTypeSupport persistent_release_message_support,
29 media::EmeFeatureSupport persistent_state_support, 32 media::EmeFeatureSupport persistent_state_support,
30 media::EmeFeatureSupport distinctive_identifier_support, 33 media::EmeFeatureSupport distinctive_identifier_support,
31 std::vector<media::KeySystemInfo>* concrete_key_systems); 34 std::vector<media::KeySystemInfo>* concrete_key_systems);
32 35
33 } // namespace cdm 36 } // namespace cdm
34 37
35 #endif // COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_ 38 #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