Update ClearKey to support CDM_6

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 31 matching lines @@
                              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 CloseSession(uint32 promise_id,
+                            const char* web_session_id,
+                            uint32_t web_session_id_length) OVERRIDE;
+  virtual void RemoveSession(uint32 promise_id,
+                             const char* web_session_id,
+                             uint32_t web_session_id_length) OVERRIDE;
   virtual void SetServerCertificate(
       uint32 promise_id,
       const uint8_t* server_certificate_data,
       uint32_t server_certificate_data_size) OVERRIDE;
+  virtual void GetUsableKeyIds(uint32_t promise_id,

[ddorwin, 2014/08/08 23:36:25]

nit: This should before the above function to match CDM_6.

As an aside, I'm surprised SSC is here in CDM.h since it is a non-session (aka
MediaKeys) method.

[jrummell, 2014/08/11 18:59:04]

Done.

+                               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_1& encrypted_buffer,
+  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_1& encrypted_buffer,
+      const cdm::InputBuffer& encrypted_buffer,
       cdm::VideoFrame* video_frame) OVERRIDE;
   virtual cdm::Status DecryptAndDecodeSamples(
-      const cdm::InputBuffer_1& encrypted_buffer,
+      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 OnSessionMessage(const std::string& web_session_id,
                         const std::vector<uint8>& message,
                         const GURL& destination_url);
   void OnSessionClosed(const std::string& web_session_id);
 
   // Handle the success/failure of a promise. These methods are responsible for
   // calling |host_| to resolve or reject 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 OnSessionUpdated(uint32 promise_id, const std::string& web_session_id);
   void OnSessionReleased(uint32 promise_id, const std::string& web_session_id);
+  void OnUsableKeyIdsObtained(uint32 promise_id, const KeyIdsVector& key_ids);
   void OnPromiseFailed(uint32 promise_id,
                        MediaKeys::Exception exception_code,
                        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.
   // Returns cdm::kDecryptError if any decryption error occurred. In this case
   // |decrypted_buffer| should be ignored by the caller.
   cdm::Status DecryptToMediaDecoderBuffer(
-      const cdm::InputBuffer_1& encrypted_buffer,
+      const cdm::InputBuffer& encrypted_buffer,
       scoped_refptr<DecoderBuffer>* decrypted_buffer);
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
   int64 CurrentTimeStampInMicroseconds() const;
 
   // Generates fake video frames with |duration_in_microseconds|.
   // Returns the number of samples generated in the |audio_frames|.
   int GenerateFakeAudioFramesFromDuration(int64 duration_in_microseconds,
                                           cdm::AudioFrames* audio_frames) const;
 
@@ skipping 47 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_