Bug 1325543 - Avoid unnecessarily awaiting procedure for Widevine CDM installation.
Currently, gecko doesn't support download and installation for Widevine CDM on Android.
Returning Cdm_not_supported avoids the subsequent call to AwaitInstall() while requesting MediaKeySystemAccess.
MozReview-Commit-ID: 3mOEf9iWE1G
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -165,18 +165,18 @@ MediaKeySystemAccess::GetKeySystemStatus
return MediaKeySystemStatus::Cdm_disabled;
}
return EnsureCDMInstalled(aKeySystem, aOutMessage);
#ifdef MOZ_WIDGET_ANDROID
} else if (Preferences::GetBool("media.mediadrm-widevinecdm.visible", false)) {
nsCString keySystem = NS_ConvertUTF16toUTF8(aKeySystem);
bool supported = mozilla::java::MediaDrmProxy::IsSchemeSupported(keySystem);
if (!supported) {
- aOutMessage = NS_LITERAL_CSTRING("Widevine CDM is not available");
- return MediaKeySystemStatus::Cdm_not_installed;
+ aOutMessage = NS_LITERAL_CSTRING("KeySystem or Minimum API level not met for Widevine EME");
+ return MediaKeySystemStatus::Cdm_not_supported;
}
return MediaKeySystemStatus::Available;
#endif
}
}
return MediaKeySystemStatus::Cdm_not_supported;
}