Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: media/renderers/video_renderer_impl.cc

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 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 | « media/renderers/video_renderer_impl.h ('k') | media/renderers/video_renderer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/video_renderer_impl.cc
diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc
index e9eb0786a944c5e06ae130c0b92844ed6a5edbd5..f1b129e7e5f0a3e6533a9452a8338f48f7ffedb0 100644
--- a/media/renderers/video_renderer_impl.cc
+++ b/media/renderers/video_renderer_impl.cc
@@ -123,7 +123,7 @@ void VideoRendererImpl::StartPlayingFrom(base::TimeDelta timestamp) {
void VideoRendererImpl::Initialize(
DemuxerStream* stream,
const PipelineStatusCB& init_cb,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const StatisticsCB& statistics_cb,
const BufferingStateCB& buffering_state_cb,
const base::Closure& ended_cb,
@@ -168,7 +168,7 @@ void VideoRendererImpl::Initialize(
video_frame_stream_->Initialize(
stream, base::Bind(&VideoRendererImpl::OnVideoFrameStreamInitialized,
weak_factory_.GetWeakPtr()),
- set_cdm_ready_cb, statistics_cb, waiting_for_decryption_key_cb);
+ cdm_context, statistics_cb, waiting_for_decryption_key_cb);
}
scoped_refptr<VideoFrame> VideoRendererImpl::Render(
« no previous file with comments | « media/renderers/video_renderer_impl.h ('k') | media/renderers/video_renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698