Widevine CENC drm engine update: enable decryption

This import syncs to the widevine git repostiory change
commit ab3e1e43642cf36900f55169597a33f222709fdb

Change-Id: I3a6f1e2969e5fe7ed1ca12f90b0eb0a3b7899835

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -18,7 +18,9 @@ namespace wvcdm {
 
 class CdmSession {
  public:
-  CdmSession() : state_(INITIAL), session_id_(GenerateSessionId()) {}
+  CdmSession() : session_id_(GenerateSessionId()),
+                 license_received_(false),
+                 properties_valid_(false) {}
   ~CdmSession() {}
 
   bool Init();
@@ -46,12 +48,14 @@ class CdmSession {
   CdmResponseType QueryKeyStatus(CdmQueryMap* key_info);
 
   // Decrypt() - Accept encrypted buffer and return decrypted data.
-  CdmResponseType Decrypt(const uint8_t* encrypted_buffer,
-                          size_t encrypted_size,
-                          size_t block_offset,
-                          const std::vector<uint8_t>& iv,
+  CdmResponseType Decrypt(bool is_encrypted,
                           const KeyId& key_id,
-                          uint8_t* decrypted_buffer);
+                          const uint8_t* encrypt_buffer,
+                          size_t encrypt_length,
+                          const std::vector<uint8_t>& iv,
+                          size_t block_offset,
+                          void* decrypt_buffer,
+                          bool is_video);
 
   // License renewal
   // GenerateRenewalRequest() - Construct valid renewal request for the current
@@ -73,22 +77,18 @@ class CdmSession {
   // Generate unique ID for each new session.
   CdmSessionId GenerateSessionId();
 
-  typedef enum {
-    INITIAL,
-    LICENSE_REQUESTED,
-    LICENSE_RESPONSE_DONE,
-    RENEWAL_ENABLED,
-    RENEWAL_REQUESTED,
-    LICENSE_EXPIRED
-  } CdmSessionState;
-
   // instance variables
-  CdmSessionState state_;
   const CdmSessionId session_id_;
   CdmKeySystem key_system_;
   CdmLicense license_parser_;
   CryptoSession* crypto_session_;
   PolicyEngine policy_engine_;
+  bool license_received_;
+
+  bool properties_valid_;
+  bool require_explicit_renew_request_;
+
+  KeyId key_id_;
 
   std::set<WvCdmEventListener*> listeners_;