Merge "Integrate OnExpirationUpdate and OnSessionKeysChange with Android"

libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h

@@ -14,11 +14,9 @@ class WvCdmEventListener {
   virtual ~WvCdmEventListener() {}
 
   virtual void OnSessionRenewalNeeded(const CdmSessionId& session_id) = 0;
-  virtual void OnSessionExpiration(const CdmSessionId& session_id) = 0;
-  virtual void OnSessionKeysChange(
-      const CdmSessionId& session_id,
-      const std::vector<CdmKeyInformation>& cdm_keys_info,
-      bool has_new_usable_key) = 0;
+  virtual void OnSessionKeysChange(const CdmSessionId& session_id,
+                                   const CdmKeyStatusMap& keys_status,
+                                   bool has_new_usable_key) = 0;
   virtual void OnExpirationUpdate(const CdmSessionId& session_id,
                                   int64_t new_expiry_time) = 0;
 

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -51,12 +51,12 @@ enum CdmResponseType {
 
 enum CdmKeyStatus {
   kKeyStatusUsable,
-  kKeyStatusInternalError,
   kKeyStatusExpired,
   kKeyStatusOutputNotAllowed,
-  kKeyStatusOutputDownscaled,
   kKeyStatusPending,
+  kKeyStatusInternalError,
 };
+typedef std::map<KeyId, CdmKeyStatus> CdmKeyStatusMap;
 
 #define CORE_DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&);                    \
@@ -125,14 +125,6 @@ struct CdmDecryptionParameters {
         is_video(true) {}
 };
 
-struct CdmKeyInformation {
-  CdmKeyInformation(const KeyId& id, CdmKeyStatus status)
-      : key_id(id), key_status(status) {}
-
-  KeyId key_id;
-  CdmKeyStatus key_status;
-};
-
 // forward class references
 class KeyMessage;
 class Request;