Add Promises for EME (Chromium side)

media/cdm/ppapi/external_clear_key/clear_key_cdm.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_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 17 matching lines @@
 class DecoderBuffer;
 class FFmpegCdmAudioDecoder;
 
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public ClearKeyCdmInterface {
  public:
   ClearKeyCdm(Host* host, const std::string& key_system);
   virtual ~ClearKeyCdm();
 
   // ContentDecryptionModule implementation.
-  virtual void CreateSession(
-      uint32 session_id,
-      const char* type, uint32 type_size,
-      const uint8* init_data, uint32 init_data_size) OVERRIDE;
-  virtual void LoadSession(
-      uint32_t session_id,
-      const char* web_session_id, uint32_t web_session_id_length) OVERRIDE;
-  virtual void UpdateSession(
-      uint32 session_id,
-      const uint8* response, uint32 response_size) OVERRIDE;
-  virtual void ReleaseSession(uint32 session_id) OVERRIDE;
+  virtual void CreateSession(uint32 promise_id,
+                             const char* init_data_type,
+                             uint32 init_data_type_size,
+                             const uint8* init_data,
+                             uint32 init_data_size,
+                             cdm::SessionType session_type) OVERRIDE;
+  virtual void LoadSession(uint32 promise_id,
+                           const char* web_session_id,
+                           uint32_t web_session_id_length) OVERRIDE;
+  virtual void UpdateSession(uint32 promise_id,
+                             const char* web_session_id,
+                             uint32_t web_session_id_length,
+                             const uint8* response,
+                             uint32 response_size) OVERRIDE;
+  virtual void ReleaseSession(uint32 promise_id,
+                              const char* web_session_id,
+                              uint32_t web_session_id_length) OVERRIDE;
   virtual void TimerExpired(void* context) OVERRIDE;
   virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
                               cdm::DecryptedBlock* decrypted_block) OVERRIDE;
   virtual cdm::Status InitializeAudioDecoder(
       const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE;
   virtual cdm::Status InitializeVideoDecoder(
       const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
   virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE;
   virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE;
   virtual cdm::Status DecryptAndDecodeFrame(
       const cdm::InputBuffer& encrypted_buffer,
       cdm::VideoFrame* video_frame) OVERRIDE;
   virtual cdm::Status DecryptAndDecodeSamples(
       const cdm::InputBuffer& encrypted_buffer,
       cdm::AudioFrames* audio_frames) OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual void OnPlatformChallengeResponse(
       const cdm::PlatformChallengeResponse& response) OVERRIDE;
   virtual void OnQueryOutputProtectionStatus(
       uint32_t link_mask, uint32_t output_protection_mask) OVERRIDE;
 
  private:
   // Emulates a session stored for |session_id_for_emulated_loadsession_|. This
   // is necessary since aes_decryptor.cc does not support storing sessions.
   void LoadLoadableSession();
 
   // ContentDecryptionModule callbacks.
-  void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
-  void OnSessionMessage(uint32 session_id,
+  void OnSessionMessage(const std::string& web_session_id,
                         const std::vector<uint8>& message,
                         const std::string& destination_url);
-  void OnSessionReady(uint32 session_id);
-  void OnSessionClosed(uint32 session_id);
-  void OnSessionError(uint32 session_id,
-                      MediaKeys::KeyError error_code,
-                      uint32 system_code);
+
+  // Handle the success of a promise. These methods are responsible to calling
+  // |host_| to acknowledge the promise.
+  void OnSessionCreated(uint32 promise_id, const std::string& web_session_id);
+  void OnSessionLoaded(uint32 promise_id, const std::string& web_session_id);
+  void OnSessionReady(uint32 promise_id, const std::string& web_session_id);
+  void OnSessionClosed(uint32 promise_id, const std::string& web_session_id);
+  void OnSessionError(uint32 promise_id,
+                      const std::string& error_name,
+                      uint32 system_code,
+                      const std::string& error_message);
 
   // Prepares next heartbeat message and sets a timer for it.
   void ScheduleNextHeartBeat();
 
   // Decrypts the |encrypted_buffer| and puts the result in |decrypted_buffer|.
   // Returns cdm::kSuccess if decryption succeeded. The decrypted result is
   // put in |decrypted_buffer|. If |encrypted_buffer| is empty, the
   // |decrypted_buffer| is set to an empty (EOS) buffer.
   // Returns cdm::kNoKey if no decryption key was available. In this case
   // |decrypted_buffer| should be ignored by the caller.
@@ skipping 15 matching lines @@
   // Returns cdm::kSuccess if any audio frame is successfully generated.
   cdm::Status GenerateFakeAudioFrames(int64 timestamp_in_microseconds,
                                       cdm::AudioFrames* audio_frames);
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
   void StartFileIOTest();
 
   // Callback for CDM File IO test.
   void OnFileIOTestComplete(bool success);
 
+  // Keep track of the last session created.
+  void SetSessionId(const std::string& web_session_id);
+
   AesDecryptor decryptor_;
 
   ClearKeyCdmHost* host_;
 
   const std::string key_system_;
 
-  uint32 last_session_id_;
+  std::string last_session_id_;
   std::string next_heartbeat_message_;
 
   // TODO(xhwang): Extract testing code from main implementation.
   // See http://crbug.com/341751
-  uint32 session_id_for_emulated_loadsession_;
+  std::string session_id_for_emulated_loadsession_;
+  uint32_t promise_id_for_emulated_loadsession_;
 
   // Timer delay in milliseconds for the next host_->SetTimer() call.
   int64 timer_delay_ms_;
 
   // Indicates whether a heartbeat timer has been set to prevent multiple timers
   // from running.
   bool heartbeat_timer_set_;
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
   int channel_count_;
@@ skipping 10 matching lines @@
   scoped_ptr<CdmVideoDecoder> video_decoder_;
 
   scoped_ptr<FileIOTestRunner> file_io_test_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_