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

Source release v3.0.3

Browse Source
This commit is contained in:
Joey Parrish
2015-11-09 16:40:25 -08:00
parent 7a64ef6641
commit 3d5571eaa1
6 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cdm/include/cdm_version.h
View File

@@ -1,2 +1,2 @@
// Widevine CE CDM Version
#define CDM_VERSION "v3.0.2-0-g161de1b-ce"
#define CDM_VERSION "v3.0.3-0-g226db8b-ce"

13
cdm/src/cdm.cpp
View File

@@ -408,12 +408,6 @@ Cdm::Status CdmImpl::update(const std::string& session_id,
return kInvalidAccess;
}
bool predicted_to_be_server_cert_response =
property_set_.use_privacy_mode() &&
property_set_.service_certificate().empty();
(void)predicted_to_be_server_cert_response;
// predicted_to_be_server_cert_response is now used when assertions are off.
// NOTE: If the CdmSession object recognizes that this is not the first
// AddKey(), it will internally delegate to RenewKey().
CdmKeySetId key_set_id = session_id;
@@ -422,7 +416,7 @@ Cdm::Status CdmImpl::update(const std::string& session_id,
if (result == NEED_KEY) {
// We just provisioned a server certificate.
assert(predicted_to_be_server_cert_response);
assert(property_set_.use_privacy_mode());
// The cert is now available to all sessions in this CDM instance.
// This is consistent with the behavior of the Chrome CDM.
@@ -450,10 +444,7 @@ Cdm::Status CdmImpl::update(const std::string& session_id,
MessageType message_type = kLicenseRequest;
listener_->onMessage(session_id, message_type, key_request);
return kSuccess;
}
assert(!predicted_to_be_server_cert_response);
if (result != KEY_ADDED) {
} else if (result != KEY_ADDED) {
LOGE("Unexpected error %d", result);
return kUnexpectedError;
}