Source release 16.2.0

core/include/cdm_engine.h

@@ -195,9 +195,6 @@ class CdmEngine {
   // system. This will force the device to reprovision itself.
   virtual CdmResponseType Unprovision(CdmSecurityLevel security_level);
 
-  // Delete OEMCrypto usage tables. Used by Unprovision().
-  virtual CdmResponseType DeleteUsageTable(CdmSecurityLevel security_level);
-
   // Return the list of key_set_ids stored on the current (origin-specific)
   // file system.
   virtual CdmResponseType ListStoredLicenses(
@@ -261,8 +258,9 @@ class CdmEngine {
 
   // Decryption and key related methods
   // Accept encrypted buffer and return decrypted data.
-  virtual CdmResponseType Decrypt(const CdmSessionId& session_id,
-                                  const CdmDecryptionParameters& parameters);
+  virtual CdmResponseType DecryptV16(
+      const CdmSessionId& session_id,
+      const CdmDecryptionParametersV16& parameters);
 
   // Generic crypto operations - provides basic crypto operations that an
   // application can use outside of content stream processing
@@ -343,6 +341,7 @@ class CdmEngine {
     app_package_name_ = app_package_name;
   }
   virtual const std::string& GetAppPackageName() { return app_package_name_; }
+  virtual void SetSpoid(const std::string& spoid) { spoid_ = spoid; }
 
  protected:
   friend class CdmEngineFactory;
@@ -353,8 +352,7 @@ class CdmEngine {
   friend class TestLicenseHolder;
 
   CdmEngine(FileSystem* file_system,
-            std::shared_ptr<metrics::EngineMetrics> metrics,
-            const std::string& spoid = EMPTY_SPOID);
+            std::shared_ptr<metrics::EngineMetrics> metrics);
 
  private:
   // private methods
@@ -364,7 +362,6 @@ class CdmEngine {
                               const CdmSessionId* forced_session_id,
                               CdmSessionId* session_id);
 
-  void DeleteAllUsageReportsUponFactoryReset();
   bool ValidateKeySystem(const CdmKeySystem& key_system);
   CdmResponseType GetUsageInfo(const std::string& app_id,
                                SecurityLevel requested_security_level,
@@ -396,9 +393,10 @@ class CdmEngine {
   Clock clock_;
   std::string spoid_;
 
-  static bool seeded_;
-
-  // usage related variables
+  // Usage related variables
+  // Used to isolate a single active usage information license.  Loading,
+  // creating or releasing a different usage licenses through the engine
+  // API will release the handle to previously active secure stop license.
   std::unique_ptr<CdmSession> usage_session_;
   std::unique_ptr<UsagePropertySet> usage_property_set_;
   int64_t last_usage_information_update_time_;