diff options
Diffstat (limited to 'media/cdm/ppapi/cdm_adapter.h')
| -rw-r--r-- | media/cdm/ppapi/cdm_adapter.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h index 57e7524..ec7145d 100644 --- a/media/cdm/ppapi/cdm_adapter.h +++ b/media/cdm/ppapi/cdm_adapter.h @@ -53,12 +53,12 @@ class CdmAdapter : public pp::Instance, // Note: Results of calls to these methods must be reported through the // PPB_ContentDecryptor_Private interface. virtual void Initialize(const std::string& key_system) OVERRIDE; - virtual void CreateSession(uint32_t reference_id, + virtual void CreateSession(uint32_t session_id, const std::string& type, pp::VarArrayBuffer init_data) OVERRIDE; - virtual void UpdateSession(uint32_t reference_id, + virtual void UpdateSession(uint32_t session_id, pp::VarArrayBuffer response) OVERRIDE; - virtual void ReleaseSession(uint32_t reference_id) OVERRIDE; + virtual void ReleaseSession(uint32_t session_id) OVERRIDE; virtual void Decrypt( pp::Buffer_Dev encrypted_buffer, const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE; @@ -104,17 +104,17 @@ class CdmAdapter : public pp::Instance, cdm::Status decoder_status) OVERRIDE; // cdm::Host_3 implementation. - virtual void OnSessionCreated(uint32_t reference_id, - const char* session_id, - uint32_t session_id_length) OVERRIDE; - virtual void OnSessionMessage(uint32_t reference_id, + virtual void OnSessionCreated(uint32_t session_id, + const char* web_session_id, + uint32_t web_session_id_length) OVERRIDE; + virtual void OnSessionMessage(uint32_t session_id, const char* message, uint32_t message_length, const char* destination_url, uint32_t destination_url_length) OVERRIDE; - virtual void OnSessionReady(uint32_t reference_id) OVERRIDE; - virtual void OnSessionClosed(uint32_t reference_id) OVERRIDE; - virtual void OnSessionError(uint32_t reference_id, + virtual void OnSessionReady(uint32_t session_id) OVERRIDE; + virtual void OnSessionClosed(uint32_t session_id) OVERRIDE; + virtual void OnSessionError(uint32_t session_id, cdm::MediaKeyError error_code, uint32_t system_code) OVERRIDE; @@ -129,16 +129,16 @@ class CdmAdapter : public pp::Instance, // <code>callback_factory_</code> to ensure that calls into // <code>PPP_ContentDecryptor_Private</code> are asynchronous. void SendSessionCreatedInternal(int32_t result, - uint32_t reference_id, - const std::string& session_id); + uint32_t session_id, + const std::string& web_session_id); void SendSessionMessageInternal(int32_t result, - uint32_t reference_id, + uint32_t session_id, const std::vector<uint8>& message, const std::string& default_url); - void SendSessionReadyInternal(int32_t result, uint32_t reference_id); - void SendSessionClosedInternal(int32_t result, uint32_t reference_id); + void SendSessionReadyInternal(int32_t result, uint32_t session_id); + void SendSessionClosedInternal(int32_t result, uint32_t session_id); void SendSessionErrorInternal(int32_t result, - uint32_t reference_id, + uint32_t session_id, cdm::MediaKeyError error_code, uint32_t system_code); |