wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1227790 - Update GMP API to include new MediaKeyStatus types. r=jwwang

Browse Source
This commit is contained in:
Chris Pearce 2015-11-26 13:51:05 +13:00
parent ef8c2a6362
commit bd93db9a98
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/eme/MediaKeyStatusMap.cpp
View File

@ -108,8 +108,10 @@ ToMediaKeyStatus(GMPMediaKeyStatus 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 kGMPOutputRestricted: return MediaKeyStatus::Output_restricted;
case kGMPInternalError: return MediaKeyStatus::Internal_error;
case kGMPReleased: return MediaKeyStatus::Released;
case kGMPStatusPending: return MediaKeyStatus::Status_pending;
default: return MediaKeyStatus::Internal_error;
}
}

8
dom/media/gmp/gmp-api/gmp-decryption.h
View File

@ -94,10 +94,12 @@ enum GMPMediaKeyStatus {
kGMPUsable = 0,
kGMPExpired = 1,
kGMPOutputDownscaled = 2,
kGMPOutputNotAllowed = 3,
kGMPOutputRestricted = 3,
kGMPInternalError = 4,
kGMPUnknown = 5,
kGMPMediaKeyStatusInvalid = 6 // Must always be last.
kGMPUnknown = 5, // Removes key from MediaKeyStatusMap
kGMPReleased = 6,
kGMPStatusPending = 7,
kGMPMediaKeyStatusInvalid = 8 // Must always be last.
};
// Time in milliseconds, as offset from epoch, 1 Jan 1970.