Add Promises for EME (Chromium side)

media/cdm/aes_decryptor.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CRYPTO_AES_DECRYPTOR_H_
 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 
 namespace crypto {
 class SymmetricKey;
 }
 
 namespace media {
 
 // Decrypts an AES encrypted buffer into an unencrypted buffer. The AES
 // encryption must be CTR with a key size of 128bits.
 class MEDIA_EXPORT AesDecryptor : public MediaKeys, public Decryptor {
  public:
-  AesDecryptor(const SessionCreatedCB& session_created_cb,
-               const SessionMessageCB& session_message_cb,
-               const SessionReadyCB& session_ready_cb,
-               const SessionClosedCB& session_closed_cb,
-               const SessionErrorCB& session_error_cb);
+  AesDecryptor(const SessionMessageCB& session_message_cb);
   virtual ~AesDecryptor();
 
   // MediaKeys implementation.
-  virtual bool CreateSession(uint32 session_id,
-                             const std::string& content_type,
+  virtual void CreateSession(const std::string& init_data_type,
                              const uint8* init_data,
-                             int init_data_length) OVERRIDE;
-  virtual void LoadSession(uint32 session_id,
-                           const std::string& web_session_id) OVERRIDE;
-  virtual void UpdateSession(uint32 session_id,
-                             const uint8* response,
-                             int response_length) OVERRIDE;
-  virtual void ReleaseSession(uint32 session_id) OVERRIDE;
+                             int init_data_length,
+                             SessionType session_type,
+                             scoped_ptr<CdmNewSessionPromise> promise) OVERRIDE;
+  virtual void LoadSession(const std::string& web_session_id,
+                           scoped_ptr<CdmNewSessionPromise> promise) OVERRIDE;
+  virtual void UpdateSession(
+      const std::string& web_session_id,
+      const uint8* response,
+      int response_length,
+      scoped_ptr<CdmChangeSessionPromise> promise) OVERRIDE;
+  virtual void ReleaseSession(
+      const std::string& web_session_id,
+      scoped_ptr<CdmChangeSessionPromise> promise) OVERRIDE;
   virtual Decryptor* GetDecryptor() OVERRIDE;
 
   // Decryptor implementation.
   virtual void RegisterNewKeyCB(StreamType stream_type,
                                 const NewKeyCB& key_added_cb) OVERRIDE;
   virtual void Decrypt(StreamType stream_type,
                        const scoped_refptr<DecoderBuffer>& encrypted,
                        const DecryptCB& decrypt_cb) OVERRIDE;
   virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;
   virtual void InitializeAudioDecoder(const AudioDecoderConfig& config,
@@ skipping 38 matching lines @@
   // optimized so that Decrypt() has fast access, at the cost of slow deletion
   // of keys when a session is released.
   class SessionIdDecryptionKeyMap;
 
   // Key ID <-> SessionIdDecryptionKeyMap map.
   typedef base::ScopedPtrHashMap<std::string, SessionIdDecryptionKeyMap>
       KeyIdToSessionKeysMap;
 
   // Creates a DecryptionKey using |key_string| and associates it with |key_id|.
   // Returns true if successful.
-  bool AddDecryptionKey(const uint32 session_id,
+  bool AddDecryptionKey(const std::string& web_session_id,
                         const std::string& key_id,
                         const std::string& key_string);
 
   // Gets a DecryptionKey associated with |key_id|. The AesDecryptor still owns
   // the key. Returns NULL if no key is associated with |key_id|.
   DecryptionKey* GetKey(const std::string& key_id) const;
 
-  // Deletes all keys associated with |session_id|.
-  void DeleteKeysForSession(const uint32 session_id);
+  // Deletes all keys associated with |web_session_id|.
+  void DeleteKeysForSession(const std::string& web_session_id);
 
   // Callbacks for firing session events.
-  SessionCreatedCB session_created_cb_;
   SessionMessageCB session_message_cb_;
-  SessionReadyCB session_ready_cb_;
-  SessionClosedCB session_closed_cb_;
-  SessionErrorCB session_error_cb_;
 
   // Since only Decrypt() is called off the renderer thread, we only need to
   // protect |key_map_|, the only member variable that is shared between
   // Decrypt() and other methods.
   KeyIdToSessionKeysMap key_map_;  // Protected by |key_map_lock_|.
   mutable base::Lock key_map_lock_;  // Protects the |key_map_|.
 
-  // Keeps track of current valid session IDs.
-  std::set<uint32> valid_sessions_;
+  // Keeps track of current valid sessions.
+  std::set<std::string> valid_sessions_;
 
   // Make web session ID unique per renderer by making it static. Web session
   // IDs seen by the app will be "1", "2", etc.
   static uint32 next_web_session_id_;
 
   NewKeyCB new_audio_key_cb_;
   NewKeyCB new_video_key_cb_;
 
   // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the
   // main thread but called on the media thread.
   mutable base::Lock new_key_cb_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AesDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CRYPTO_AES_DECRYPTOR_H_