content/renderer/pepper/video_decoder_shim.cc - Issue 1442933002: 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: content/renderer/pepper/video_decoder_shim.cc

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

Patch Set: fix compile errors 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: content/renderer/pepper/video_decoder_shim.cc

diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc

index 3f2c5e807e02f02517f6975ae9012bb17a5661a0..ae191272e7e399b105251b18871567ee7d5d908e 100644

--- a/content/renderer/pepper/video_decoder_shim.cc

+++ b/content/renderer/pepper/video_decoder_shim.cc

@@ -21,6 +21,7 @@

#include "content/renderer/pepper/pepper_video_decoder_host.h"

#include "content/renderer/render_thread_impl.h"

#include "gpu/command_buffer/client/gles2_implementation.h"

+#include "media/base/cdm_context.h"

#include "media/base/decoder_buffer.h"

#include "media/base/limits.h"

#include "media/base/media_util.h"

@@ -700,7 +701,7 @@ void VideoDecoderShim::DecoderImpl::Initialize(

DCHECK_EQ(decoder_->GetMaxDecodeRequests(), 1);

decoder_->Initialize(

- config, true /* low_delay */,

+ config, true /* low_delay */, media::SetCdmReadyCB(),

base::Bind(&VideoDecoderShim::DecoderImpl::OnInitDone,

weak_ptr_factory_.GetWeakPtr()),

base::Bind(&VideoDecoderShim::DecoderImpl::OnOutputComplete,

« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | media/base/audio_decoder.h » ('j') | no next file with comments »