Source release 17.1.0

core/include/entitlement_key_session.h

@@ -1,6 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 
 #ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_
 #define WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_
@@ -19,7 +19,7 @@ class EntitlementKeySession : public ContentKeySession {
  public:
   EntitlementKeySession(CryptoSessionId oec_session_id,
                         metrics::CryptoMetrics* metrics);
-  ~EntitlementKeySession() override {}
+  ~EntitlementKeySession() override;
 
   KeySessionType Type() override { return kEntitlement; }
 
@@ -35,6 +35,9 @@ class EntitlementKeySession : public ContentKeySession {
       const std::vector<CryptoKey>& keys) override;
   OEMCryptoResult SelectKey(const std::string& key_id,
                             CdmCipherMode cipher_mode) override;
+  OEMCryptoResult Decrypt(
+      const OEMCrypto_SampleDescription* samples, size_t samples_length,
+      const OEMCrypto_CENCEncryptPatternDesc& pattern) override;
 
  private:
   // The message is populated with the fields of the provided CryptoKey and the
@@ -47,6 +50,7 @@ class EntitlementKeySession : public ContentKeySession {
   std::map<KeyId, CryptoKey> entitled_keys_;
   // Find the current entitled content key id for the given entitlement key id.
   std::map<KeyId, KeyId> current_loaded_content_keys_;
+  EntitledKeySessionId key_session_id_;
 };
 
 }  // namespace wvcdm