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

Added CDM support for production readiness reporting. am: cd5afa88a6 am: cce550d006

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

Change-Id: Ib68038545cfc302f34eabe52264188b3e7ff356b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Dale
2022-05-10 22:04:13 +00:00
committed by Automerger Merge Worker
parent d7c8a60b05 cce550d006
commit 866cd26693
13 changed files with 112 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,6 +221,11 @@ class CryptoSession {
RequestedSecurityLevel requested_security_level,
CdmWatermarkingSupport* support);
virtual bool GetProductionReadiness(CdmProductionReadiness* readiness);
virtual bool GetProductionReadiness(
RequestedSecurityLevel requested_security_level,
CdmProductionReadiness* readiness);
virtual bool GetMaximumUsageTableEntries(
RequestedSecurityLevel security_level, size_t* number_of_entries);

1
libwvdrmengine/cdm/core/include/oemcrypto_adapter.h
View File

@@ -72,6 +72,7 @@ OEMCryptoResult OEMCrypto_GetOEMPublicCertificate(uint8_t* public_cert,
RequestedSecurityLevel level);
OEMCrypto_WatermarkingSupport OEMCrypto_GetWatermarkingSupport(
RequestedSecurityLevel level);
OEMCryptoResult OEMCrypto_ProductionReady(RequestedSecurityLevel level);
} // namespace wvcdm
/* The following functions are deprecated in OEMCrypto v13. They are defined

1
libwvdrmengine/cdm/core/include/wv_cdm_constants.h
View File

@@ -112,6 +112,7 @@ static const std::string QUERY_KEY_ANALOG_OUTPUT_CAPABILITIES =
static const std::string QUERY_KEY_CAN_DISABLE_ANALOG_OUTPUT =
"CanDisableAnalogOutput";
static const std::string QUERY_KEY_WATERMARKING_SUPPORT = "WatermarkingSupport";
static const std::string QUERY_KEY_PRODUCTION_READY = "ProductionReady";
static const std::string QUERY_VALUE_TRUE = "True";
static const std::string QUERY_VALUE_FALSE = "False";

7
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -599,6 +599,12 @@ enum CdmWatermarkingSupport : int32_t {
kWatermarkingAlwaysOn
};
enum CdmProductionReadiness : int32_t {
kProductionReadinessUnknown,
kProductionReadinessTrue,
kProductionReadinessFalse,
};
class CdmKeyAllowedUsage {
public:
CdmKeyAllowedUsage() { Clear(); }
@@ -842,6 +848,7 @@ const char* CdmUsageEntryStorageTypeToString(CdmUsageEntryStorageType type);
const char* RequestedSecurityLevelToString(
RequestedSecurityLevel security_level);
const char* CdmWatermarkingSupportToString(CdmWatermarkingSupport support);
const char* CdmProductionReadinessToString(CdmProductionReadiness readiness);
// Converts a generic, unknown enum value to a string representation
// containing its numeric value.
// The pointer returned from this function is thread_local.