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

Merge "Fix DASH movie playback decrypt error" into jb-mr2-dev

Browse Source
This commit is contained in:
Jeff Tinker
2013-04-14 23:56:40 +00:00
committed by Android (Google) Code Review
parent c0dde16644 4f47afda9f
commit 40abceaaed
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,6 +96,7 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
// Iterate through subsamples, sending them to the CDM serially. // Iterate through subsamples, sending them to the CDM serially.
size_t offset = 0; size_t offset = 0;
size_t encrypted_offset = 0;
for (size_t i = 0; i < numSubSamples; ++i) { for (size_t i = 0; i < numSubSamples; ++i) {
const SubSample &subSample = subSamples[i]; const SubSample &subSample = subSamples[i];
@@ -110,7 +111,7 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
CdmResponseType res = mCDM->Decrypt(mSessionId, false, keyId, CdmResponseType res = mCDM->Decrypt(mSessionId, false, keyId,
source + offset, source + offset,
subSample.mNumBytesOfClearData, subSample.mNumBytesOfClearData,
ivVector, offset % 16, dest + offset); ivVector, 0, dest + offset);
if (res != wvcdm::NO_ERROR) { if (res != wvcdm::NO_ERROR) {
ALOGE("Decrypt error result in session %s during unencrypted block: %d", ALOGE("Decrypt error result in session %s during unencrypted block: %d",
@@ -127,7 +128,7 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
CdmResponseType res = mCDM->Decrypt(mSessionId, true, keyId, CdmResponseType res = mCDM->Decrypt(mSessionId, true, keyId,
source + offset, source + offset,
subSample.mNumBytesOfEncryptedData, subSample.mNumBytesOfEncryptedData,
ivVector, offset % 16, dest + offset); ivVector, encrypted_offset % 16, dest + offset);
if (res != wvcdm::NO_ERROR) { if (res != wvcdm::NO_ERROR) {
ALOGE("Decrypt error result in session %s during encrypted block: %d", ALOGE("Decrypt error result in session %s during encrypted block: %d",
@@ -136,6 +137,7 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
} }
offset += subSample.mNumBytesOfEncryptedData; offset += subSample.mNumBytesOfEncryptedData;
encrypted_offset += subSample.mNumBytesOfEncryptedData;
} }
} }