Source release v2.2.0-0-903 + third_party libs

Change-Id: I03f670eaeb052bc741abb347be06f8ddc58418e7

core/include/crypto_session.h

@@ -18,6 +18,17 @@ typedef std::map<CryptoKeyId, CryptoKey*> CryptoKeyMap;
 
 class CryptoSession {
  public:
+  // This enum should be kept in sync with the values specified for
+  // HDCP capabilities in OEMCryptoCENC.h. (See comments for
+  // OEMCrypto_GetHDCPCapability)
+  typedef enum {
+    kOemCryptoHdcpNotSupported = 0,
+    kOemCryptoHdcpVersion1 = 1,
+    kOemCryptoHdcpVersion2 = 2,
+    kOemCryptoHdcpVersion2_1 = 3,
+    kOemCryptoHdcpVersion2_2 = 4,
+    kOemCryptoNoHdcpDeviceAttached = 0xff,
+  } OemCryptoHdcpVersion;
   CryptoSession();
   virtual ~CryptoSession();
 
@@ -37,7 +48,7 @@ class CryptoSession {
   virtual CryptoSessionId oec_session_id() { return oec_session_id_; }
 
   // Key request/response
-  virtual void GenerateRequestId(std::string& req_id_str);
+  virtual bool GenerateRequestId(std::string* req_id_str);
   virtual bool PrepareRequest(const std::string& key_deriv_message,
                               bool is_provisioning, std::string* signature);
   virtual bool PrepareRenewalRequest(const std::string& message,
@@ -66,6 +77,7 @@ class CryptoSession {
   // Media data path
   virtual CdmResponseType Decrypt(const CdmDecryptionParameters& parameters);
 
+  virtual bool UsageInformationSupport(bool* has_support);
   virtual CdmResponseType UpdateUsageInformation();
   virtual CdmResponseType GenerateUsageReport(
       const std::string& provider_session_token, std::string* usage_report);
@@ -73,6 +85,8 @@ class CryptoSession {
       const std::string& message, const std::string& signature,
       const std::string& provider_session_token);
 
+  virtual bool GetHdcpCapabilities(OemCryptoHdcpVersion* current,
+                                   OemCryptoHdcpVersion* max);
   virtual bool GetRandom(size_t data_length, uint8_t* random_data);
 
  private: