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

am 3a586ab2: Report HDCP status of no HDCP device attached

Browse Source 
* commit '3a586ab27bb8b5621e12b07fa6a8f1ed5da354a8':
  Report HDCP status of no HDCP device attached
This commit is contained in:
Rahul Frias
2014-11-25 17:48:15 +00:00
committed by Android Git Automerger
parent 967a9704d0 3a586ab27b
commit 045c6f614a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/src/license.cpp
View File

@@ -324,6 +324,10 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
ClientIdentification_ClientCapabilities_HdcpVersion_HDCP_V2_2); ClientIdentification_ClientCapabilities_HdcpVersion_HDCP_V2_2);
break; break;
case CryptoSession::kOemCryptoNoHdcpDeviceAttached: case CryptoSession::kOemCryptoNoHdcpDeviceAttached:
client_capabilities->set_max_hdcp_version(
video_widevine_server::sdk::
ClientIdentification_ClientCapabilities_HdcpVersion_HDCP_NO_DIGITAL_OUTPUT);
break;
default: default:
LOGW( LOGW(
"CdmLicense::PrepareKeyRequest: unexpected HDCP max capability " "CdmLicense::PrepareKeyRequest: unexpected HDCP max capability "

2
libwvdrmengine/cdm/core/src/license_protocol.proto
View File

@@ -129,6 +129,7 @@ message License {
HDCP_V2 = 2; HDCP_V2 = 2;
HDCP_V2_1 = 3; HDCP_V2_1 = 3;
HDCP_V2_2 = 4; HDCP_V2_2 = 4;
HDCP_NO_DIGITAL_OUTPUT = 0xff;
} }
optional HDCP hdcp = 1 [default = HDCP_NONE]; optional HDCP hdcp = 1 [default = HDCP_NONE];
@@ -401,6 +402,7 @@ message ClientIdentification {
HDCP_V2 = 2; HDCP_V2 = 2;
HDCP_V2_1 = 3; HDCP_V2_1 = 3;
HDCP_V2_2 = 4; HDCP_V2_2 = 4;
HDCP_NO_DIGITAL_OUTPUT = 0xff;
} }
optional bool client_token = 1 [default = false]; optional bool client_token = 1 [default = false];