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

Cherry-pick bug fixes from CDM main branch.

Browse Source 
* Split device cert declaration from definition.
* Fix and rename CdmApi?Test.TimeTest.
* Fix max HDCP setting.

Change-Id: Idf0aea5c953a08c38a8beb20ec8ccc210e33f67a
This commit is contained in:
Joey Parrish
2015-02-17 10:59:19 -08:00
parent f4dbc2acd2
commit bd448c6252
7 changed files with 358 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/license.cpp
View File

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

2
core/src/license_protocol.proto
View File

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