Merge "Add HDCP cap logging on HDCP-based failures." into udc-widevine-dev

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -69,6 +69,8 @@ class CryptoSession {
   static CryptoSession* MakeCryptoSession(
       metrics::CryptoMetrics* crypto_metrics);
 
+  static const char* HdcpCapabilityToString(HdcpCapability hdcp_level);
+
   virtual ~CryptoSession();
 
   // This method will try to terminate OEMCrypto if |session_size_| is 0.
@@ -552,6 +554,9 @@ class CryptoSession {
   // same error code in sequence of each other.  A value of
   // OEMCrypto_SUCCESS indicates that no error have yet occurred.
   OEMCryptoResult last_decrypt_error_ = OEMCrypto_SUCCESS;
+  // Similar to |last_decrypt_error_|, but intended for calls to
+  // SelectKey().
+  OEMCryptoResult last_select_key_error_ = OEMCrypto_SUCCESS;
 
   // In order to avoid creating a deadlock if instantiation needs to take any
   // of the CryptoSession static mutexes, |factory_| is protected by its own