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

Merge "Changes to support new MediaDrm methods"

Browse Source
This commit is contained in:
Rahul Frias
2018-02-09 03:36:39 +00:00
committed by Android (Google) Code Review
parent 8d27f791e6 dc25029fc4
commit 928ae5639e
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -1621,7 +1621,7 @@ std::string CdmEngine::MapHdcpVersion(
CryptoSession::HdcpCapability version) {
switch (version) {
case HDCP_NONE:
return QUERY_VALUE_UNPROTECTED;
return QUERY_VALUE_HDCP_NONE;
case HDCP_V1:
return QUERY_VALUE_HDCP_V1;
case HDCP_V2:
@@ -1631,9 +1631,10 @@ std::string CdmEngine::MapHdcpVersion(
case HDCP_V2_2:
return QUERY_VALUE_HDCP_V2_2;
case HDCP_NO_DIGITAL_OUTPUT:
return QUERY_VALUE_DISCONNECTED;
return QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT;
default:
return QUERY_VALUE_HDCP_LEVEL_UNKNOWN;
}
return "";
}
void CdmEngine::CloseExpiredReleaseSessions() {