(This is a merge of http://go/wvgerrit/65782) We have had our own scoped_ptr implementation that is used throughout the codebase. Now that we support C++11, we can replace these with std::unique_ptr. Doing this replacement exposed a few places where the two were not interchangeable. OEMCrypto Ref was doing some unsafe things with passing scoped_ptrs to functions and has been updated to use move semantics. And a few constructors were explicitly constructing a scoped_ptr with NULL, which is ambiguous with std::unique_ptr. These have been replaced with default constructor calls. Bug: 111851141 Test: CE CDM Unit Tests Test: Android Unit Tests Change-Id: I37d6d7aad4906709381c74f0c5439f826d2be768
112 lines
3.4 KiB
C++
112 lines
3.4 KiB
C++
// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
|
|
// source code may only be used and distributed under the Widevine Master
|
|
// License Agreement.
|
|
|
|
#include "log.h"
|
|
#include "properties.h"
|
|
#include "wv_cdm_constants.h"
|
|
|
|
namespace {
|
|
const char* kSecurityLevelDirs[] = {"L1/", "L3/"};
|
|
} // namespace
|
|
|
|
namespace wvcdm {
|
|
bool Properties::oem_crypto_use_secure_buffers_;
|
|
bool Properties::oem_crypto_use_fifo_;
|
|
bool Properties::oem_crypto_use_userspace_buffers_;
|
|
bool Properties::provisioning_messages_are_binary_;
|
|
bool Properties::allow_service_certificate_requests_;
|
|
std::unique_ptr<CdmClientPropertySetMap> Properties::session_property_set_;
|
|
|
|
bool Properties::AddSessionPropertySet(
|
|
const CdmSessionId& session_id, CdmClientPropertySet* property_set) {
|
|
if (NULL == session_property_set_.get()) {
|
|
return false;
|
|
}
|
|
std::pair<CdmClientPropertySetMap::iterator, bool> result =
|
|
session_property_set_->insert(
|
|
std::pair<const CdmSessionId, CdmClientPropertySet*>(
|
|
session_id, property_set));
|
|
return result.second;
|
|
}
|
|
|
|
bool Properties::RemoveSessionPropertySet(const CdmSessionId& session_id) {
|
|
if (NULL == session_property_set_.get()) {
|
|
return false;
|
|
}
|
|
return (1 == session_property_set_->erase(session_id));
|
|
}
|
|
|
|
CdmClientPropertySet* Properties::GetCdmClientPropertySet(
|
|
const CdmSessionId& session_id) {
|
|
if (NULL != session_property_set_.get()) {
|
|
CdmClientPropertySetMap::iterator it =
|
|
session_property_set_->find(session_id);
|
|
if (it != session_property_set_->end()) {
|
|
return it->second;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
bool Properties::GetApplicationId(const CdmSessionId& session_id,
|
|
std::string* app_id) {
|
|
const CdmClientPropertySet* property_set =
|
|
GetCdmClientPropertySet(session_id);
|
|
if (NULL == property_set) {
|
|
return false;
|
|
}
|
|
*app_id = property_set->app_id();
|
|
return true;
|
|
}
|
|
|
|
bool Properties::GetServiceCertificate(const CdmSessionId& session_id,
|
|
std::string* service_certificate) {
|
|
const CdmClientPropertySet* property_set =
|
|
GetCdmClientPropertySet(session_id);
|
|
if (property_set == NULL) {
|
|
return false;
|
|
}
|
|
*service_certificate = property_set->service_certificate();
|
|
return true;
|
|
}
|
|
|
|
bool Properties::SetServiceCertificate(const CdmSessionId& session_id,
|
|
const std::string& service_certificate) {
|
|
CdmClientPropertySet* property_set =
|
|
GetCdmClientPropertySet(session_id);
|
|
if (property_set == NULL) {
|
|
return false;
|
|
}
|
|
property_set->set_service_certificate(service_certificate);
|
|
return true;
|
|
}
|
|
|
|
bool Properties::UsePrivacyMode(const CdmSessionId& session_id) {
|
|
const CdmClientPropertySet* property_set =
|
|
GetCdmClientPropertySet(session_id);
|
|
if (NULL == property_set) {
|
|
return false;
|
|
}
|
|
return property_set->use_privacy_mode();
|
|
}
|
|
|
|
uint32_t Properties::GetSessionSharingId(const CdmSessionId& session_id) {
|
|
const CdmClientPropertySet* property_set =
|
|
GetCdmClientPropertySet(session_id);
|
|
if (NULL == property_set) {
|
|
return 0;
|
|
}
|
|
return property_set->session_sharing_id();
|
|
}
|
|
|
|
bool Properties::GetSecurityLevelDirectories(std::vector<std::string>* dirs) {
|
|
dirs->resize(sizeof(kSecurityLevelDirs) / sizeof(const char*));
|
|
for (size_t i = 0; i < dirs->size(); ++i) {
|
|
(*dirs)[i] = kSecurityLevelDirs[i];
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace wvcdm
|