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 1124939 - Add "individualization-request" to MediaKeyMessageType. r=bz

Browse Source
This commit is contained in:
JW Wang 2015-01-26 20:08:00 +01:00
parent 125d429c2d
commit bc2a1389b8
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/media/eme/CDMProxy.cpp
View File

@ -415,6 +415,7 @@ ToMediaKeyMessageType(GMPSessionMessageType aMessageType) {
case kGMPLicenseRequest: return dom::MediaKeyMessageType::License_request;
case kGMPLicenseRenewal: return dom::MediaKeyMessageType::License_renewal;
case kGMPLicenseRelease: return dom::MediaKeyMessageType::License_release;
case kGMPIndividualizationRequest: return dom::MediaKeyMessageType::Individualization_request;
default: return dom::MediaKeyMessageType::License_request;
};
};

2
dom/media/gmp-plugin/fake.info
View File

@ -1,5 +1,5 @@
Name: fake
Description: Fake GMP Plugin
Version: 1.0
APIs: encode-video[h264], decode-video[h264], eme-decrypt-v3[fake]
APIs: encode-video[h264], decode-video[h264], eme-decrypt-v4[fake]
Libraries: dxva2.dll

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

@ -72,7 +72,8 @@ enum GMPSessionMessageType {
kGMPLicenseRequest = 0,
kGMPLicenseRenewal = 1,
kGMPLicenseRelease = 2,
kGMPMessageInvalid = 3 // Must always be last.
kGMPIndividualizationRequest = 3,
kGMPMessageInvalid = 4 // Must always be last.
};
// Time in milliseconds, as offset from epoch, 1 Jan 1970.
@ -219,7 +220,7 @@ enum GMPSessionType {
kGMPSessionInvalid = 2 // Must always be last.
};
#define GMP_API_DECRYPTOR "eme-decrypt-v3"
#define GMP_API_DECRYPTOR "eme-decrypt-v4"
// API exposed by plugin library to manage decryption sessions.
// When the Host requests this by calling GMPGetAPIFunc().

3
dom/webidl/MediaKeyMessageEvent.webidl
View File

@ -13,7 +13,8 @@
enum MediaKeyMessageType {
"license-request",
"license-renewal",
"license-release"
"license-release",
"individualization-request"
};
[Pref="media.eme.enabled", Constructor(DOMString type, optional MediaKeyMessageEventInit eventInitDict)]

2
media/gmp-clearkey/0.1/clearkey.info
View File

@ -1,4 +1,4 @@
Name: clearkey
Description: ClearKey decrypt-only GMP plugin
Version: 0.1
APIs: eme-decrypt-v3[org.w3.clearkey]
APIs: eme-decrypt-v4[org.w3.clearkey]