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

Snap for 6357108 from 906363bf57 to sc-release

Browse Source 
Change-Id: Idf25de588d3be1a207267ecbd293ad39293b8b79
This commit is contained in:
android-build-team Robot
2020-04-02 02:11:52 +00:00
parent 1132a71331 906363bf57
commit cbda4a5f82
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -748,12 +748,13 @@ CdmResponseType CryptoSession::Open(SecurityLevel requested_security_level) {
open_ = true; open_ = true;
// Get System ID and save it. // Get System ID and save it.
if (GetSystemIdInternal(&system_id_) == NO_ERROR) { result = GetSystemIdInternal(&system_id_);
if (result == NO_ERROR) {
metrics_->crypto_session_system_id_.Record(system_id_); metrics_->crypto_session_system_id_.Record(system_id_);
} else { } else {
LOGE("Failed to fetch system ID"); LOGE("Failed to fetch system ID");
metrics_->crypto_session_system_id_.SetError(LOAD_SYSTEM_ID_ERROR); metrics_->crypto_session_system_id_.SetError(result);
return LOAD_SYSTEM_ID_ERROR; return result;
} }
// Set up request ID // Set up request ID
@@ -2693,6 +2694,7 @@ OEMCryptoResult CryptoSession::DecryptSample(
if (sts == OEMCrypto_ERROR_BUFFER_TOO_LARGE) { if (sts == OEMCrypto_ERROR_BUFFER_TOO_LARGE) {
// Fall back to sending each subsample region individually // Fall back to sending each subsample region individually
sts = OEMCrypto_SUCCESS;
OEMCrypto_SampleDescription fake_sample = sample; OEMCrypto_SampleDescription fake_sample = sample;
for (size_t i = 0; i < sample.subsamples_length; ++i) { for (size_t i = 0; i < sample.subsamples_length; ++i) {
const OEMCrypto_SubSampleDescription& original_subsample = const OEMCrypto_SubSampleDescription& original_subsample =