Source release v3.0.1 + third_party

cdm/include/cdm.h

@@ -34,7 +34,17 @@ typedef __int64 int64_t;
 
 namespace widevine {
 
-class CDM_EXPORT Cdm {
+class CDM_EXPORT ITimerClient {
+ public:
+  // Called by ITimer when a timer expires.
+  virtual void onTimerExpired(void* context) = 0;
+
+ protected:
+  ITimerClient() {}
+  virtual ~ITimerClient() {}
+};
+
+class CDM_EXPORT Cdm : public ITimerClient {
  public:
   // Session types defined by EME.
   typedef enum {
@@ -179,21 +189,17 @@ class CDM_EXPORT Cdm {
   // See Cdm::initialize().
   class ITimer {
    public:
-    class IClient {
-     public:
-      // Called by ITimer when a timer expires.
-      virtual void onTimerExpired(void* context) = 0;
-
-     protected:
-      IClient() {}
-      virtual ~IClient() {}
-    };
+    // This typedef is for backward compatibility with v3.0.0.
+    typedef ITimerClient IClient;
 
     // Call |client->onTimerExpired(context)| after a delay of |delay_ms| ms.
     virtual void setTimeout(int64_t delay_ms,
                             IClient* client,
                             void* context) = 0;
 
+    // Cancel all timers associated with |client|.
+    virtual void cancel(IClient *client) = 0;
+
    protected:
     ITimer() {}
     virtual ~ITimer() {}
@@ -425,6 +431,27 @@ class CDM_EXPORT Cdm {
   virtual Status decrypt(const InputBuffer& input,
                          const OutputBuffer& output) = 0;
 
+  // Sets a value in the custom app settings.  These are settings
+  // that are sent with any message to the license server.  These methods
+  // should only be used by advanced users maintaining existing systems.
+  // The |key| cannot be empty.
+  virtual Status setAppParameter(const std::string& key,
+                                 const std::string& value) = 0;
+
+  // Gets the current value in the custom app settings.  If the key is
+  // not present, then kInvalidAccess is returned.  The |key| cannot be
+  // empty.  |result| cannot be null.  See setAppParameter().
+  virtual Status getAppParameter(const std::string& key,
+                                 std::string* result) = 0;
+
+  // Removes the value in the custom app settings.  If the key is not
+  // present, then kInvalidAccess is returned.  The |key| cannot be empty.
+  // See setAppParameter().
+  virtual Status removeAppParameter(const std::string& key) = 0;
+
+  // Clears all the values in the custom app settings.  See setAppParameter().
+  virtual Status clearAppParameters() = 0;
+
  protected:
   Cdm() {}
 };

cdm/include/cdm_version.h

@@ -1,2 +1,2 @@
 // Widevine CE CDM Version
-#define CDM_VERSION "v3.0.0-0-g8d3792b-ce"
+#define CDM_VERSION "v3.0.1-0-g41710d9-ce"