diff --git a/dom/media/eme/MediaKeyStatusMap.cpp b/dom/media/eme/MediaKeyStatusMap.cpp index 30bfb9a68422..15f8465e1f4d 100644 --- a/dom/media/eme/MediaKeyStatusMap.cpp +++ b/dom/media/eme/MediaKeyStatusMap.cpp @@ -182,7 +182,9 @@ ToMediaKeyStatus(GMPMediaKeyStatus aStatus) { switch (aStatus) { case kGMPUsable: return MediaKeyStatus::Usable; case kGMPExpired: return MediaKeyStatus::Expired; + case kGMPOutputDownscaled: return MediaKeyStatus::Output_downscaled; case kGMPOutputNotAllowed: return MediaKeyStatus::Output_not_allowed; + case kGMPInternalError: return MediaKeyStatus::Internal_error; default: return MediaKeyStatus::Internal_error; } } diff --git a/dom/media/gmp-plugin/fake.info b/dom/media/gmp-plugin/fake.info index 58624893c0cf..9e77de1dd297 100644 --- a/dom/media/gmp-plugin/fake.info +++ b/dom/media/gmp-plugin/fake.info @@ -1,5 +1,5 @@ Name: fake Description: Fake GMP Plugin Version: 1.0 -APIs: encode-video[h264], decode-video[h264], eme-decrypt-v5[fake] +APIs: encode-video[h264], decode-video[h264], eme-decrypt-v6[fake] Libraries: dxva2.dll diff --git a/dom/media/gmp/gmp-api/gmp-decryption.h b/dom/media/gmp/gmp-api/gmp-decryption.h index 30b96b750108..fa1b41bf0e6f 100644 --- a/dom/media/gmp/gmp-api/gmp-decryption.h +++ b/dom/media/gmp/gmp-api/gmp-decryption.h @@ -79,9 +79,11 @@ enum GMPSessionMessageType { enum GMPMediaKeyStatus { kGMPUsable = 0, kGMPExpired = 1, - kGMPOutputNotAllowed = 2, - kGMPUnknown = 3, - kGMPMediaKeyStatusInvalid = 4 // Must always be last. + kGMPOutputDownscaled = 2, + kGMPOutputNotAllowed = 3, + kGMPInternalError = 4, + kGMPUnknown = 5, + kGMPMediaKeyStatusInvalid = 6 // Must always be last. }; // Time in milliseconds, as offset from epoch, 1 Jan 1970. @@ -222,7 +224,7 @@ enum GMPSessionType { kGMPSessionInvalid = 2 // Must always be last. }; -#define GMP_API_DECRYPTOR "eme-decrypt-v5" +#define GMP_API_DECRYPTOR "eme-decrypt-v6" // API exposed by plugin library to manage decryption sessions. // When the Host requests this by calling GMPGetAPIFunc(). diff --git a/media/gmp-clearkey/0.1/clearkey.info b/media/gmp-clearkey/0.1/clearkey.info index feb0df924311..1837071bb1cc 100644 --- a/media/gmp-clearkey/0.1/clearkey.info +++ b/media/gmp-clearkey/0.1/clearkey.info @@ -1,4 +1,4 @@ Name: clearkey Description: ClearKey decrypt-only GMP plugin Version: 0.1 -APIs: eme-decrypt-v5[org.w3.clearkey] +APIs: eme-decrypt-v6[org.w3.clearkey]