diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-26 18:41:32 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-26 18:41:32 +0100 |
| commit | 1e1525c44c23bde16102a64e685e02a9ab6825cc (patch) | |
| tree | a2462a2f6278466e93ddedbf71983c325698933a /dom/media/gmp/widevine-adapter/WidevineAdapter.cpp | |
| parent | e25ad543952b5afc13181aaebef9c5951fc27be0 (diff) | |
| parent | eb77e289bbe056b58051db0fa868e95da803aa0a (diff) | |
| download | UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.gz UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.lz UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.xz UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.zip | |
Merge commit 'eb77e289bbe056b58051db0fa868e95da803aa0a' into Basilisk-release
Diffstat (limited to 'dom/media/gmp/widevine-adapter/WidevineAdapter.cpp')
| -rw-r--r-- | dom/media/gmp/widevine-adapter/WidevineAdapter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dom/media/gmp/widevine-adapter/WidevineAdapter.cpp b/dom/media/gmp/widevine-adapter/WidevineAdapter.cpp index 74b5c38e8..57d4ecec2 100644 --- a/dom/media/gmp/widevine-adapter/WidevineAdapter.cpp +++ b/dom/media/gmp/widevine-adapter/WidevineAdapter.cpp @@ -46,7 +46,7 @@ void* GetCdmHost(int aHostInterfaceVersion, void* aUserData) Log("GetCdmHostFunc(%d, %p)", aHostInterfaceVersion, aUserData); WidevineDecryptor* decryptor = reinterpret_cast<WidevineDecryptor*>(aUserData); MOZ_ASSERT(decryptor); - return static_cast<cdm::Host_8*>(decryptor); + return static_cast<cdm::Host_9*>(decryptor); } #define STRINGIFY(s) _STRINGIFY(s) @@ -106,8 +106,8 @@ WidevineAdapter::GMPGetAPI(const char* aAPIName, WidevineDecryptor* decryptor = new WidevineDecryptor(); - auto cdm = reinterpret_cast<cdm::ContentDecryptionModule*>( - create(cdm::ContentDecryptionModule::kVersion, + auto cdm = reinterpret_cast<cdm::ContentDecryptionModule_9*>( + create(cdm::ContentDecryptionModule_9::kVersion, kEMEKeySystemWidevine.get(), kEMEKeySystemWidevine.Length(), &GetCdmHost, @@ -161,8 +161,8 @@ WidevineAdapter::Supports(int32_t aModuleVersion, int32_t aHostVersion) { return aModuleVersion == CDM_MODULE_VERSION && - aInterfaceVersion == cdm::ContentDecryptionModule::kVersion && - aHostVersion == cdm::Host_8::kVersion; + aInterfaceVersion == cdm::ContentDecryptionModule_9::kVersion && + aHostVersion == cdm::Host_9::kVersion; } } // namespace mozilla |