widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support AES-CBC sample encryption in MediaDrm

Browse Source 
bug:23719082
Change-Id: I1842bab291d6c86a87e46abbb98827c87f7f1d53
This commit is contained in:
Jeff Tinker
2015-12-18 12:00:35 -08:00
parent 53463f292d
commit 4aedea8512
6 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp
View File

@@ -89,9 +89,12 @@ status_t WVCryptoPlugin::setMediaDrmSession(const Vector<uint8_t>& sessionId) {
// size, but in practice this should never happen for AES-CTR.
ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
const uint8_t iv[KEY_IV_SIZE], Mode mode,
const Pattern &pattern,
const void* srcPtr, const SubSample* subSamples,
size_t numSubSamples, void* dstPtr,
AString* errorDetailMsg) {
ALOGD("mode=%d, pattern:{encrypted=%d, skip=%d}", (int)mode, pattern.mEncryptBlocks, pattern.mSkipBlocks);
if (mode != kMode_Unencrypted && mode != kMode_AES_CTR) {
errorDetailMsg->setTo("Encryption mode is not supported by Widevine CDM.");
return kErrorUnsupportedCrypto;