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

DO NOT MERGE Only pass whole clear frames to OEMCrypto_CopyBuffer

Browse Source 
am: 58bad94991

* commit '58bad949913fc9311e9318d5d7a5f8f06a592367':
  DO NOT MERGE Only pass whole clear frames to OEMCrypto_CopyBuffer
This commit is contained in:
Rahul Frias
2016-03-04 18:20:31 +00:00
committed by android-build-merger
parent 311d3f75c0 58bad94991
commit 1eeb1ee359
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -665,7 +665,9 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {
} }
OEMCryptoResult sts = OEMCrypto_ERROR_NOT_IMPLEMENTED; OEMCryptoResult sts = OEMCrypto_ERROR_NOT_IMPLEMENTED;
if (!params.is_encrypted) { if (!params.is_encrypted &&
params.subsample_flags ==
(OEMCrypto_FirstSubsample | OEMCrypto_LastSubsample)) {
sts = OEMCrypto_CopyBuffer(requested_security_level_, sts = OEMCrypto_CopyBuffer(requested_security_level_,
params.encrypt_buffer, params.encrypt_length, params.encrypt_buffer, params.encrypt_length,
&buffer_descriptor, params.subsample_flags); &buffer_descriptor, params.subsample_flags);