Source release 14.1.0

cdm/include/cdm.h

@@ -1,4 +1,6 @@
-// Copyright 2015 Google Inc. All Rights Reserved.
+// 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.
 // Based on the EME draft spec from 2016 June 10.
 // http://www.w3.org/TR/2016/WD-encrypted-media-20160610/"
 #ifndef WVCDM_CDM_CDM_H_
@@ -318,7 +320,9 @@ class CDM_EXPORT Cdm : public ITimerClient {
   };
 
   // Initialize the CDM library and provide access to platform services.
-  // All platform interfaces are required.
+  // All platform interfaces are required. It is the responsibility of the host
+  // platform to ensure that the objects passed into this method remain valid
+  // for the lifetime of the CDM library.
   // Logging is controlled by |verbosity|.
   // Must be called and must return kSuccess before create() is called.
   static Status initialize(
@@ -337,9 +341,9 @@ class CDM_EXPORT Cdm : public ITimerClient {
   // instance may be constructed.
   // The CDM may notify of events at any time via the provided |listener|,
   // which may not be NULL.
-  // |storage| defines the storage to use for this instance.  This can be used
-  // to provide per-origin storage.  Passing NULL will use the storage passed
-  // to initialize().
+  // |storage| defines the storage to use for this instance.  By providing
+  // different objects here for different origins, this parameter can be used to
+  // provide per-origin storage. It may not be NULL.
   // If |privacy_mode| is true, server certificates are required and will be
   // used to encrypt messages to the license server.
   // By using server certificates to encrypt communication with the license
@@ -387,6 +391,15 @@ class CDM_EXPORT Cdm : public ITimerClient {
   // dertermined by the CDM's current IStorage object.
   virtual bool isProvisioned() = 0;
 
+  // Creates a Provisioning Request message.
+  // This is used to provision the device.  The request should be sent to the
+  // provisioning server and the response given to handleProvisioningResponse().
+  virtual Status getProvisioningRequest(std::string* request) = 0;
+
+  // Handles a provisioning response and provisions the device.  If this returns
+  // success, the device will now be provisioned.
+  virtual Status handleProvisioningResponse(const std::string& response) = 0;
+
   // Remove the device's Device Certificate (for the current origin).
   // The Device Certificate is origin-specific, and the origin is
   // determined by the CDM's current IStorage object.
@@ -485,6 +498,21 @@ class CDM_EXPORT Cdm : public ITimerClient {
   // session is fully removed.
   virtual Status remove(const std::string& session_id) = 0;
 
+  // Removes stored session data associated with the session.
+  // The session must be loaded before it can be removed.
+  // Unlike remove(), this method does not generate a release message. The
+  // stored data is removed immediately. The session is closed if this function
+  // returns successfully.
+  // Generally, callers should not use this method, as it prevents usage data
+  // from being gathered and it does not allow the license's release to be
+  // tracked by the server. Most callers will want to use remove(), which
+  // generates a release request. However, this method is provided for
+  // applications that have a specific need to release licenses without a server
+  // roundtrip and are aware of the costs of doing so.
+  // There is no EME equivalent to this method. EME specifies that removal
+  // should require a release request, as is done by the remove() method.
+  virtual Status forceRemove(const std::string& session_id) = 0;
+
   // Describes a repeating pattern as defined by the CENC 3.0 standard. A
   // CENC 3.0 pattern consists of a number of encrypted blocks followed by a
   // number of clear blocks, after which it repeats.

cdm/include/cdm_version.h

@@ -1,3 +1,3 @@
 // Widevine CE CDM Version
-#define CDM_VERSION "14.0.0"
+#define CDM_VERSION "14.1.0"
 #define EME_VERSION "https://www.w3.org/TR/2017/REC-encrypted-media-20170918"

cdm/include/properties_ce.h

@@ -1,4 +1,6 @@
-// Copyright 2015 Google Inc. All Rights Reserved.
+// 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.
 #ifndef WVCDM_CDM_PROPERTIES_CE_H_
 #define WVCDM_CDM_PROPERTIES_CE_H_