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/WidevineUtils.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/WidevineUtils.cpp')
| -rw-r--r-- | dom/media/gmp/widevine-adapter/WidevineUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dom/media/gmp/widevine-adapter/WidevineUtils.cpp b/dom/media/gmp/widevine-adapter/WidevineUtils.cpp index 925dfe1a1..10c6c2e18 100644 --- a/dom/media/gmp/widevine-adapter/WidevineUtils.cpp +++ b/dom/media/gmp/widevine-adapter/WidevineUtils.cpp @@ -43,7 +43,7 @@ ToGMPErr(cdm::Status aStatus) case cdm::kSuccess: return GMPNoErr; case cdm::kNeedMoreData: return GMPGenericErr; case cdm::kNoKey: return GMPNoKeyErr; - case cdm::kSessionError: return GMPGenericErr; + case cdm::kInitializationError: return GMPGenericErr; case cdm::kDecryptError: return GMPCryptoErr; case cdm::kDecodeError: return GMPDecodeErr; case cdm::kDeferredInitialization: return GMPGenericErr; @@ -77,7 +77,7 @@ void InitInputBuffer(const GMPEncryptedBufferMetadata* aCrypto, aInputBuffer.timestamp = aTimestamp; } -CDMWrapper::CDMWrapper(cdm::ContentDecryptionModule_8* aCDM, +CDMWrapper::CDMWrapper(cdm::ContentDecryptionModule_9* aCDM, WidevineDecryptor* aDecryptor) : mCDM(aCDM) , mDecryptor(aDecryptor) |