Source release 16.3.0

core/include/cdm_session.h

@@ -219,7 +219,7 @@ class CdmSession {
  private:
   friend class CdmSessionTest;
 
-  bool GenerateKeySetId(CdmKeySetId* key_set_id);
+  bool GenerateKeySetId(bool atsc_mode_enabled, CdmKeySetId* key_set_id);
 
   CdmResponseType StoreLicense();
 
@@ -233,6 +233,12 @@ class CdmSession {
   virtual CdmResponseType AddKeyInternal(const CdmKeyResponse& key_response);
   void UpdateRequestLatencyTiming(CdmResponseType sts);
 
+  // Checks that the usage entry in the usage table header matches the
+  // information of the currently loaded license for this session.
+  // Returns false if there is any unexpected mismatch of information,
+  // true otherwise.
+  bool VerifyOfflineUsageEntry();
+
   // These setters are for testing only. Takes ownership of the pointers.
   void set_license_parser(CdmLicense* license_parser);
   void set_crypto_session(CryptoSession* crypto_session);