Source release v3.5.0

core/include/policy_engine.h

@@ -106,6 +106,10 @@ class PolicyEngine {
 
   bool CanRenew() { return policy_.can_renew(); }
 
+  bool IsSufficientOutputProtection(const KeyId& key_id) {
+    return license_keys_->MeetsConstraints(key_id);
+  }
+
  private:
   friend class PolicyEngineTest;
   friend class PolicyEngineConstraintsTest;
@@ -132,7 +136,8 @@ class PolicyEngine {
   int64_t GetRentalExpiryTime();
   // Gets the clock time that the license expires based on whether we have
   // started playing.  This takes into account GetHardLicenseExpiryTime.
-  int64_t GetExpiryTime(int64_t current_time, bool is_load);
+  int64_t GetExpiryTime(int64_t current_time,
+                        bool ignore_soft_enforce_playback_duration);
 
   int64_t GetLicenseOrRentalDurationRemaining(int64_t current_time);
   int64_t GetPlaybackDurationRemaining(int64_t current_time);
@@ -151,6 +156,9 @@ class PolicyEngine {
   // expiry time changes.
   void NotifyExpirationUpdate(int64_t current_time);
 
+  // Guard against clock rollbacks
+  int64_t GetCurrentTime();
+
   // set_clock() is for testing only. It alters ownership of the
   // passed-in pointer.
   void set_clock(Clock* clock);
@@ -182,6 +190,9 @@ class PolicyEngine {
   // calculate the time where renewal retries should occur.
   int64_t next_renewal_time_;
 
+  // to assist in clock rollback checks
+  int64_t last_recorded_current_time_;
+
   // Used to dispatch CDM events.
   CdmSessionId session_id_;
   WvCdmEventListener* event_listener_;