Source release v2.1.1-0-738 + third_party libs

Change-Id: I76e298f8092951d4214c776d6bbcad6b763eb5b2

core/include/cdm_engine.h

@@ -4,6 +4,7 @@
 #define WVCDM_CORE_CDM_ENGINE_H_
 
 #include "certificate_provisioning.h"
+#include "initialization_data.h"
 #include "oemcrypto_adapter.h"
 #include "wv_cdm_types.h"
 
@@ -35,7 +36,7 @@ class CdmEngine {
   // Construct a valid license request
   CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
                                      const CdmKeySetId& key_set_id,
-                                     const CdmInitData& init_data,
+                                     const InitializationData& init_data,
                                      const CdmLicenseType license_type,
                                      CdmAppParameterMap& app_parameters,
                                      CdmKeyMessage* key_request,
@@ -76,16 +77,29 @@ class CdmEngine {
                                       CdmQueryMap* key_info);
 
   // Provisioning related methods
-  CdmResponseType GetProvisioningRequest(CdmProvisioningRequest* request,
-                                         std::string* default_url);
+  CdmResponseType GetProvisioningRequest(
+      CdmCertificateType cert_type,
+      const std::string& cert_authority,
+      CdmProvisioningRequest* request,
+      std::string* default_url);
 
-  CdmResponseType HandleProvisioningResponse(CdmProvisioningResponse& response);
+  CdmResponseType HandleProvisioningResponse(
+      CdmProvisioningResponse& response,
+      std::string* cert,
+      std::string* wrapped_key);
+
+  // Secure stop related methods
+  CdmResponseType GetSecureStops(CdmSecureStops* secure_stops);
+  CdmResponseType ReleaseSecureStops(
+      const CdmSecureStopReleaseMessage& message);
 
   // Decryption and key related methods
   // Accept encrypted buffer and return decrypted data.
   CdmResponseType Decrypt(const CdmSessionId& session_id,
                           const CdmDecryptionParameters& parameters);
 
+  size_t SessionSize() const { return sessions_.size(); }
+
   // Is the key known to any session?
   bool IsKeyLoaded(const KeyId& key_id);
   bool FindSessionForKey(const KeyId& key_id, CdmSessionId* sessionId);
@@ -96,11 +110,6 @@ class CdmEngine {
   bool DetachEventListener(const CdmSessionId& session_id,
                            WvCdmEventListener* listener);
 
-  // Parse a blob of multiple concatenated PSSH atoms to extract the first
-  // widevine pssh
-  static bool ExtractWidevinePssh(const CdmInitData& init_data,
-                                  CdmInitData* output);
-
   // Timer expiration method
   void OnTimerEvent();