diff options
| -rw-r--r-- | components/cdm/renderer/android_key_systems.cc | 9 | ||||
| -rw-r--r-- | media/base/android/media_player_android.cc | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/components/cdm/renderer/android_key_systems.cc b/components/cdm/renderer/android_key_systems.cc index e1538ba..8076a2a 100644 --- a/components/cdm/renderer/android_key_systems.cc +++ b/components/cdm/renderer/android_key_systems.cc @@ -59,6 +59,11 @@ void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems, max_audio_robustness = EmeRobustness::HW_SECURE_CRYPTO; max_video_robustness = EmeRobustness::HW_SECURE_ALL; } + + // We are using MediaDrm API on Android and we cannot guarantee that API + // doesn't use persistent storage on the device. Therefore always set + // persistent state to EME_FEATURE_ALWAYS_ENABLED to err on the safe side. + if (codecs != media::EME_CODEC_NONE) { AddWidevineWithCodecs( WIDEVINE, @@ -67,7 +72,7 @@ void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems, max_video_robustness, media::EME_SESSION_TYPE_NOT_SUPPORTED, // persistent-license. media::EME_SESSION_TYPE_NOT_SUPPORTED, // persistent-release-message. - media::EME_FEATURE_NOT_SUPPORTED, // Persistent state. + media::EME_FEATURE_ALWAYS_ENABLED, // Persistent state. media::EME_FEATURE_ALWAYS_ENABLED, // Distinctive identifier. concrete_key_systems); } @@ -85,7 +90,7 @@ void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems, EmeRobustness::HW_SECURE_ALL, // Max video robustness. media::EME_SESSION_TYPE_NOT_SUPPORTED, // persistent-license. media::EME_SESSION_TYPE_NOT_SUPPORTED, // persistent-release-message. - media::EME_FEATURE_NOT_SUPPORTED, // Persistent state. + media::EME_FEATURE_ALWAYS_ENABLED, // Persistent state. media::EME_FEATURE_ALWAYS_ENABLED, // Distinctive identifier. concrete_key_systems); } diff --git a/media/base/android/media_player_android.cc b/media/base/android/media_player_android.cc index eb52e3a..3600dc0 100644 --- a/media/base/android/media_player_android.cc +++ b/media/base/android/media_player_android.cc @@ -39,7 +39,7 @@ GURL MediaPlayerAndroid::GetFirstPartyForCookies() { void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) { // Players that support EME should override this. - NOTREACHED() << "EME not supported on base MediaPlayerAndroid class."; + LOG(ERROR) << "EME not supported on base MediaPlayerAndroid class."; return; } |