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

Unified Diff: components/cdm/renderer/widevine_key_systems.cc

Issue 1106263004: Support Android secure codecs in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: components/cdm/renderer/widevine_key_systems.cc
diff --git a/components/cdm/renderer/widevine_key_systems.cc b/components/cdm/renderer/widevine_key_systems.cc
index c1412c36af8d0ccfe1771073cceeb6e864668a6d..39980667fa955176aa7d10c238fa956940a0d755 100644
--- a/components/cdm/renderer/widevine_key_systems.cc
+++ b/components/cdm/renderer/widevine_key_systems.cc
@@ -29,6 +29,9 @@ static std::string GetDirectParentName(std::string name) {
void AddWidevineWithCodecs(
WidevineCdmType widevine_cdm_type,
SupportedCodecs supported_codecs,
+#if defined(OS_ANDROID)
+ SupportedCodecs supported_secure_codecs,
+#endif // defined(OS_ANDROID)
media::EmeRobustness max_audio_robustness,
media::EmeRobustness max_video_robustness,
media::EmeSessionTypeSupport persistent_license_support,
@@ -57,6 +60,9 @@ void AddWidevineWithCodecs(
// there are no codecs supported in that container. Fix this when we support
// initDataType.
info.supported_codecs = supported_codecs;
+#if defined(OS_ANDROID)
+ info.supported_secure_codecs = supported_secure_codecs;
jrummell 2015/04/30 02:08:37 Do we need a DCHECK that |supported_secure_codecs|
sandersd (OOO until July 31) 2015/04/30 18:19:34 I had that, but in the end moved the subset logic
+#endif // defined(OS_ANDROID)
// Here we assume that support for a container imples support for the
// associated initialization data type. KeySystems handles validating

Powered by Google App Engine
This is Rietveld 408576698