Merge "Added support for additional HDCP levels." into udc-dev

2023-04-01 00:56:04 +00:00
parent adf03c92f4 6cbd75bb6c
commit e5834cb27d
7 changed files with 91 additions and 51 deletions
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -2103,9 +2103,8 @@ CdmResponseType CryptoSession::GetHdcpCapabilities(
  RETURN_IF_NULL(current, PARAMETER_NULL);
  RETURN_IF_NULL(max, PARAMETER_NULL);

-  OEMCryptoResult status;
-  WithOecReadLock("GetHdcpCapabilities", [&] {
-    status = OEMCrypto_GetHDCPCapability(security_level, current, max);
+  const OEMCryptoResult status = WithOecReadLock("GetHdcpCapabilities", [&] {
+    return OEMCrypto_GetHDCPCapability(security_level, current, max);
  });

  if (OEMCrypto_SUCCESS == status) {