media/cdm/ppapi/external_clear_key/clear_key_cdm.h - Issue 446693004: Add support for CDM_6.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 446693004: Add support for CDM_6. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: InputBuffer changes Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

index 5903642a5827c4f52ac9fdd45df773f7b66c0e72..0288998b03ee0685ca813aa04605c86fc5670b9c 100644

--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

@@ -57,7 +57,7 @@ class ClearKeyCdm : public ClearKeyCdmInterface {

const uint8_t* server_certificate_data,

uint32_t server_certificate_data_size) OVERRIDE;

virtual void TimerExpired(void* context) OVERRIDE;

- virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,

+ virtual cdm::Status Decrypt(const cdm::InputBuffer_1& encrypted_buffer,

ddorwin 2014/08/07 22:10:43 This will switch in the other CL?

jrummell 2014/08/08 00:15:08 It will go back to InputBuffer once ClearKey switc

cdm::DecryptedBlock* decrypted_block) OVERRIDE;

virtual cdm::Status InitializeAudioDecoder(

const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE;

@@ -66,10 +66,10 @@ class ClearKeyCdm : public ClearKeyCdmInterface {

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,

+ const cdm::InputBuffer_1& encrypted_buffer,

cdm::VideoFrame* video_frame) OVERRIDE;

virtual cdm::Status DecryptAndDecodeSamples(

- const cdm::InputBuffer& encrypted_buffer,

+ const cdm::InputBuffer_1& encrypted_buffer,

cdm::AudioFrames* audio_frames) OVERRIDE;

virtual void Destroy() OVERRIDE;

virtual void OnPlatformChallengeResponse(

@@ -111,7 +111,7 @@ class ClearKeyCdm : public ClearKeyCdmInterface {

// 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& encrypted_buffer,

+ const cdm::InputBuffer_1& encrypted_buffer,

scoped_refptr<DecoderBuffer>* decrypted_buffer);

#if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)