Merge "Update support for HDCP levels on Android and CE CDM." into udc-widevine-dev

This commit is contained in:
Alex Dale
2024-03-25 21:21:05 +00:00
committed by Android (Google) Code Review
4 changed files with 35 additions and 28 deletions

View File

@@ -134,7 +134,12 @@ KeyStatusType ConvertFromCdmKeyStatus(CdmKeyStatus keyStatus) {
}
HdcpLevel mapHdcpLevel(const std::string& level) {
if (level == wvcdm::QUERY_VALUE_HDCP_V1)
if (level == wvcdm::QUERY_VALUE_HDCP_V1_X ||
level == wvcdm::QUERY_VALUE_HDCP_V1_0 ||
level == wvcdm::QUERY_VALUE_HDCP_V1_1 ||
level == wvcdm::QUERY_VALUE_HDCP_V1_2 ||
level == wvcdm::QUERY_VALUE_HDCP_V1_3 ||
level == wvcdm::QUERY_VALUE_HDCP_V1_4)
return HdcpLevel::HDCP_V1;
else if (level == wvcdm::QUERY_VALUE_HDCP_V2_0)
return HdcpLevel::HDCP_V2;