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

Merge latest oemcrypto-v17 change

Browse Source 
No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
Kyle Zhang
2022-01-21 05:58:12 +00:00
committed by Fred Gylys-Colwell
parent c924960962
commit 642965c678
176 changed files with 301013 additions and 296749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -24,7 +24,7 @@
// Stringify turns macro arguments into static C strings.
// Example: STRINGIFY(this_argument) -> "this_argument"
#define STRINGIFY(PARAM...) #PARAM
#define STRINGIFY(PARAM) #PARAM
#define RETURN_STATUS_IF_NULL(PARAM) \
if ((PARAM) == nullptr) { \
@@ -66,7 +66,7 @@ int DrmKeyTypeToMetricValue(CryptoWrappedKey::Type type) {
}
} // namespace
CdmSession::CdmSession(FileSystem* file_system,
CdmSession::CdmSession(wvutil::FileSystem* file_system,
std::shared_ptr<metrics::SessionMetrics> metrics)
: metrics_(metrics),
initialized_(false),
@@ -705,7 +705,7 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParametersV16& params) {
is_usage_update_needed_ = has_provider_session_token();
}
} else {
Clock clock;
wvutil::Clock clock;
int64_t current_time = clock.GetCurrentTime();
if (policy_engine_->HasLicenseOrRentalOrPlaybackDurationExpired(
current_time)) {
@@ -887,9 +887,9 @@ bool CdmSession::GenerateKeySetId(bool atsc_mode_enabled,
}
if (atsc_mode_enabled)
*key_set_id = ATSC_KEY_SET_ID_PREFIX + b2a_hex(random_data);
*key_set_id = ATSC_KEY_SET_ID_PREFIX + wvutil::b2a_hex(random_data);
else
*key_set_id = KEY_SET_ID_PREFIX + b2a_hex(random_data);
*key_set_id = KEY_SET_ID_PREFIX + wvutil::b2a_hex(random_data);
// key set collision
if (file_handle_->LicenseExists(*key_set_id)) {