Source release 15.0.0
This commit is contained in:
@@ -68,9 +68,7 @@ void PropertiesCE::SetClientInfo(const Cdm::ClientInfo& client_info) {
|
||||
}
|
||||
|
||||
// static
|
||||
Cdm::ClientInfo PropertiesCE::GetClientInfo() {
|
||||
return client_info_;
|
||||
}
|
||||
Cdm::ClientInfo PropertiesCE::GetClientInfo() { return client_info_; }
|
||||
|
||||
// static
|
||||
void PropertiesCE::SetProvisioningMessagesAreBinary(bool new_setting) {
|
||||
@@ -82,7 +80,7 @@ void PropertiesCE::SetProvisioningMessagesAreBinary(bool new_setting) {
|
||||
namespace wvcdm {
|
||||
|
||||
// static
|
||||
void Properties::Init() {
|
||||
void Properties::InitOnce() {
|
||||
oem_crypto_use_secure_buffers_ = use_secure_buffers_;
|
||||
oem_crypto_use_fifo_ = use_fifo_;
|
||||
oem_crypto_use_userspace_buffers_ = use_userspace_buffers_;
|
||||
@@ -147,13 +145,12 @@ bool Properties::GetOEMCryptoPath(std::string*) {
|
||||
}
|
||||
|
||||
// static
|
||||
bool Properties::AlwaysUseKeySetIds() {
|
||||
return true;
|
||||
}
|
||||
bool Properties::GetSandboxId(std::string* /* sandbox_id */) { return false; }
|
||||
|
||||
// static
|
||||
bool Properties::UseProviderIdInProvisioningRequest() {
|
||||
return true;
|
||||
}
|
||||
bool Properties::AlwaysUseKeySetIds() { return true; }
|
||||
|
||||
// static
|
||||
bool Properties::UseProviderIdInProvisioningRequest() { return true; }
|
||||
|
||||
} // namespace wvcdm
|
||||
|
||||
Reference in New Issue
Block a user