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

Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev am: 6bddc2e43e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22356650

Change-Id: Ie3a368d96851245db281660c4e53fddcea63df17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Dale
2023-04-03 06:54:17 +00:00
committed by Automerger Merge Worker
parent 793f4f1ebf 6bddc2e43e
commit 2108a21f2a
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/include/cdm_engine.h
View File

@@ -452,7 +452,10 @@ class CdmEngine {
// API will release the handle to previously active secure stop license. // API will release the handle to previously active secure stop license.
std::unique_ptr<CdmSession> usage_session_; std::unique_ptr<CdmSession> usage_session_;
std::unique_ptr<UsagePropertySet> usage_property_set_; std::unique_ptr<UsagePropertySet> usage_property_set_;
int64_t last_usage_information_update_time_; int64_t last_usage_information_update_time_ = 0;
// Should be acquired before changes to |usage_property_set_| or
// |usage_session_|.
std::mutex usage_session_mutex_;
// Protect release_key_sets_ from non-thread-safe operations. // Protect release_key_sets_ from non-thread-safe operations.
std::mutex release_key_sets_lock_; std::mutex release_key_sets_lock_;

18
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -95,18 +95,17 @@ class UsagePropertySet : public CdmClientPropertySet {
CdmEngine::CdmEngine(wvutil::FileSystem* file_system, CdmEngine::CdmEngine(wvutil::FileSystem* file_system,
std::shared_ptr<metrics::EngineMetrics> metrics) std::shared_ptr<metrics::EngineMetrics> metrics)
: metrics_(metrics), : metrics_(metrics), file_system_(file_system), spoid_(EMPTY_SPOID) {
file_system_(file_system),
spoid_(EMPTY_SPOID),
usage_session_(),
usage_property_set_(),
last_usage_information_update_time_(0) {
assert(file_system); assert(file_system);
Properties::Init(); Properties::Init();
} }
CdmEngine::~CdmEngine() { CdmEngine::~CdmEngine() {
usage_session_.reset(); {
std::unique_lock<std::mutex> lock(usage_session_mutex_);
usage_session_.reset();
}
std::unique_lock<std::recursive_mutex> lock(session_map_lock_); std::unique_lock<std::recursive_mutex> lock(session_map_lock_);
session_map_.Terminate(); session_map_.Terminate();
} }
@@ -1520,6 +1519,7 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id,
int* error_detail, int* error_detail,
CdmUsageReport* usage_report) { CdmUsageReport* usage_report) {
LOGI("app_id = %s, ssid = %s", IdToString(app_id), IdToString(ssid)); LOGI("app_id = %s, ssid = %s", IdToString(app_id), IdToString(ssid));
std::unique_lock<std::mutex> lock(usage_session_mutex_);
if (!usage_property_set_) { if (!usage_property_set_) {
usage_property_set_.reset(new UsagePropertySet()); usage_property_set_.reset(new UsagePropertySet());
} }
@@ -1629,6 +1629,7 @@ CdmResponseType CdmEngine::GetUsageInfo(
LOGD("OKP fallback to L3"); LOGD("OKP fallback to L3");
requested_security_level = kLevel3; requested_security_level = kLevel3;
} }
std::unique_lock<std::mutex> lock(usage_session_mutex_);
if (!usage_property_set_) { if (!usage_property_set_) {
usage_property_set_.reset(new UsagePropertySet()); usage_property_set_.reset(new UsagePropertySet());
} }
@@ -1691,6 +1692,7 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo(
const std::string& app_id, CdmSecurityLevel cdm_security_level) { const std::string& app_id, CdmSecurityLevel cdm_security_level) {
LOGI("app_id = %s, security_level = %s", IdToString(app_id), LOGI("app_id = %s, security_level = %s", IdToString(app_id),
CdmSecurityLevelToString(cdm_security_level)); CdmSecurityLevelToString(cdm_security_level));
std::unique_lock<std::mutex> lock(usage_session_mutex_);
if (!usage_property_set_) { if (!usage_property_set_) {
usage_property_set_.reset(new UsagePropertySet()); usage_property_set_.reset(new UsagePropertySet());
} }
@@ -1764,6 +1766,7 @@ CdmResponseType CdmEngine::RemoveUsageInfo(
const std::string& app_id, const CdmSecureStopId& provider_session_token) { const std::string& app_id, const CdmSecureStopId& provider_session_token) {
LOGI("app_id = %s, pst = %s", IdToString(app_id), LOGI("app_id = %s, pst = %s", IdToString(app_id),
IdToString(provider_session_token)); IdToString(provider_session_token));
std::unique_lock<std::mutex> lock(usage_session_mutex_);
if (!usage_property_set_) { if (!usage_property_set_) {
usage_property_set_.reset(new UsagePropertySet()); usage_property_set_.reset(new UsagePropertySet());
} }
@@ -1808,6 +1811,7 @@ CdmResponseType CdmEngine::RemoveUsageInfo(
CdmResponseType CdmEngine::ReleaseUsageInfo(const CdmKeyResponse& message) { CdmResponseType CdmEngine::ReleaseUsageInfo(const CdmKeyResponse& message) {
LOGI("message_size = %zu", message.size()); LOGI("message_size = %zu", message.size());
std::unique_lock<std::mutex> lock(usage_session_mutex_);
if (!usage_session_) { if (!usage_session_) {
LOGE("Usage session not initialized"); LOGE("Usage session not initialized");
return CdmResponseType(RELEASE_USAGE_INFO_ERROR); return CdmResponseType(RELEASE_USAGE_INFO_ERROR);