From 52b274a3a441580fb0e2ca45cf99f19b14b5a16b Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Mon, 12 Nov 2018 14:16:39 -0800 Subject: [PATCH] Add HDCP 2.3 to logs Merge from master branch of Widevine repo of http://go/wvgerrit/66071 Merge from oemcrypto-v15 branch of Widevine repo of http://go/wvgerrit/63842 OEMCrypto tests log the HDCP value. This CL updates those logs to include logs for HDCP 2.3. Test: unit tests Test: tested as part of http://go/ag/5501993 Bug: 78773763 Change-Id: I7a3003e081c3c848b5d595ac241a0b546dacb747 --- libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index 53098452..76e017ce 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -143,6 +143,8 @@ const char* HDCPCapabilityAsString(OEMCrypto_HDCP_Capability value) { return "HDCP version 2.1"; case HDCP_V2_2: return "HDCP version 2.2"; + case HDCP_V2_3: + return "HDCP version 2.3"; case HDCP_NO_DIGITAL_OUTPUT: return "No HDCP device attached/using local display with secure path"; default: @@ -1454,7 +1456,7 @@ TEST_P(SessionTestDecryptWithHDCP, DecryptAPI09) { // Test parameterized by HDCP version. DecryptWithHDCP(static_cast(GetParam())); } -INSTANTIATE_TEST_CASE_P(TestHDCP, SessionTestDecryptWithHDCP, Range(1, 5)); +INSTANTIATE_TEST_CASE_P(TestHDCP, SessionTestDecryptWithHDCP, Range(1, 6)); // // Load, Refresh Keys Test