webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h - Issue 12212079: Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4.

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/ffmpeg_cdm_video_decoder.h

Issue 12212079: Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 10 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc ('k') | webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h

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

index 6155eed7bb6f3d772e4811f86b1bc5c499435a11..a551954381b881ba8961ae19937212ad5621eb3b 100644

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

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

@@ -17,7 +17,7 @@ namespace webkit_media {

class FFmpegCdmVideoDecoder : public CdmVideoDecoder {

public:

- explicit FFmpegCdmVideoDecoder(cdm::Allocator* allocator);

+ explicit FFmpegCdmVideoDecoder(cdm::Host* host);

virtual ~FFmpegCdmVideoDecoder();

// CdmVideoDecoder implementation.

@@ -48,7 +48,7 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {

bool is_initialized_;

- cdm::Allocator* const allocator_;

+ cdm::Host* const host_;

DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder);

};

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