media/filters/decrypting_video_decoder.h - Issue 1446713003: Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize().

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/filters/decrypting_video_decoder.h

Issue 1446713003: Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

Index: media/filters/decrypting_video_decoder.h

diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h

index 0651edbe38d0b0c2c66db6bbf9bb65db805e1e80..1ac97b81f32d04455f27549af2997554252823a0 100644

--- a/media/filters/decrypting_video_decoder.h

+++ b/media/filters/decrypting_video_decoder.h

@@ -31,6 +31,7 @@

DecryptingVideoDecoder(

const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,

const scoped_refptr<MediaLog>& media_log,

+ const SetCdmReadyCB& set_cdm_ready_cb,

const base::Closure& waiting_for_decryption_key_cb);

~DecryptingVideoDecoder() override;

@@ -38,7 +39,6 @@

std::string GetDisplayName() const override;

void Initialize(const VideoDecoderConfig& config,

bool low_delay,

- const SetCdmReadyCB& set_cdm_ready_cb,

const InitCB& init_cb,

const OutputCB& output_cb) override;

void Decode(const scoped_refptr<DecoderBuffer>& buffer,

« no previous file with comments | « media/filters/decrypting_demuxer_stream_unittest.cc ('k') | media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »