Added support for additional HDCP levels.
[ Merge of http://go/wvgerrit/169450 ] OEMCrypto v17 introduced several new HDCP levels that OEMCrypto may report; however, the CDM never updated to support them. The enum values of the additional levels are no longer sequential with their level of support (v1.1 is 7, and v2.1 is 3), this requires more considerations when comparing the required HDCP levels (as specified by the license) and current HDCP level supported by OEMCrypto. The following rules were used: 1) HDCP_NONE is the absolute lowest level 2) HDCP_NO_DIGITAL_OUTPUT is the absolute highest level 3) HDCP_V1 is treated as equal to all V1.x levels 4) All other versions are based on their major-minor pairs Bug: 269671291 Test: license_unittest Test: policy_engine_constraints_unittest Test: policy_engine_unittest Test: GtsMediaTestCases Change-Id: Ibecfcb981d7e019c68cb8e0c7286222253d18369
This commit is contained in:
@@ -415,8 +415,6 @@ class CdmEngine {
|
||||
|
||||
void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);
|
||||
|
||||
std::string MapHdcpVersion(CryptoSession::HdcpCapability version);
|
||||
|
||||
void CloseExpiredReleaseSessions();
|
||||
|
||||
// Returns "true" if |okp_provisioner_| should be checked.
|
||||
|
||||
Reference in New Issue
Block a user