webkit/media/crypto/ppapi/clear_key_cdm.h - Issue 11023004: Update PPP side of Pepper CDM API to support video decoding.

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: webkit/media/crypto/ppapi/clear_key_cdm.h

Issue 11023004: Update PPP side of Pepper CDM API to support video decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased, CQ'ing. Created 8 years, 2 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: webkit/media/crypto/ppapi/clear_key_cdm.h

diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h

index 2a67741e800f2857ccad09427591e7271d796a99..2d3e102037011fb60fd4e88e4516674aef2f1f0b 100644

--- a/webkit/media/crypto/ppapi/clear_key_cdm.h

+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h

@@ -44,7 +44,7 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {

cdm::DecryptedBlock* decrypted_block) OVERRIDE;

virtual cdm::Status InitializeVideoDecoder(

const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;

- virtual cdm::Status DecryptAndDecodeVideo(

+ virtual cdm::Status DecryptAndDecodeFrame(

const cdm::InputBuffer& encrypted_buffer,

cdm::VideoFrame* video_frame) OVERRIDE;

virtual void ResetVideoDecoder() OVERRIDE;

« no previous file with comments | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »