Cherry-pick bug fixes from CDM main branch.

* Split device cert declaration from definition. * Fix and rename CdmApi?Test.TimeTest. * Fix max HDCP setting. Change-Id: Idf0aea5c953a08c38a8beb20ec8ccc210e33f67a
2015-02-17 10:59:19 -08:00
parent f4dbc2acd2
commit bd448c6252
7 changed files with 358 additions and 335 deletions
--- a/core/src/license.cpp
+++ b/core/src/license.cpp
@@ -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 "