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

Unified Diff: media/remoting/remoting_renderer_factory.cc

Issue 2457563002: Media Remoting: Add remoting control logic for encrypted contents. (Closed)
Patch Set: Addressed comments from PS#12. Fixed ASAN. Created 4 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
« no previous file with comments | « media/remoting/remoting_renderer_factory.h ('k') | media/remoting/remoting_sink_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/remoting/remoting_renderer_factory.cc
diff --git a/media/remoting/remoting_renderer_factory.cc b/media/remoting/remoting_renderer_factory.cc
index 4dac389941862cd8db5ef813c0bb0afda61a38b8..d0e4a528cb8bbef4db4f25d421bf11964d7ecf88 100644
--- a/media/remoting/remoting_renderer_factory.cc
+++ b/media/remoting/remoting_renderer_factory.cc
@@ -11,9 +11,9 @@ namespace media {
RemotingRendererFactory::RemotingRendererFactory(
std::unique_ptr<RendererFactory> default_renderer_factory,
- std::unique_ptr<RemotingController> remoting_controller)
+ std::unique_ptr<RemotingRendererController> remoting_renderer_controller)
: default_renderer_factory_(std::move(default_renderer_factory)),
- remoting_controller_(std::move(remoting_controller)) {}
+ remoting_renderer_controller_(std::move(remoting_renderer_controller)) {}
RemotingRendererFactory::~RemotingRendererFactory() {}
@@ -23,10 +23,11 @@ std::unique_ptr<Renderer> RemotingRendererFactory::CreateRenderer(
AudioRendererSink* audio_renderer_sink,
VideoRendererSink* video_renderer_sink,
const RequestSurfaceCB& request_surface_cb) {
- if (remoting_controller_ && remoting_controller_->is_remoting()) {
+ if (remoting_renderer_controller_ &&
+ remoting_renderer_controller_->remote_rendering_started()) {
VLOG(1) << "Create Remoting renderer.";
return base::WrapUnique(new RemoteRendererImpl(
- media_task_runner, remoting_controller_->GetWeakPtr()));
+ media_task_runner, remoting_renderer_controller_->GetWeakPtr()));
} else {
VLOG(1) << "Create Local playback renderer.";
return default_renderer_factory_->CreateRenderer(
« no previous file with comments | « media/remoting/remoting_renderer_factory.h ('k') | media/remoting/remoting_sink_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698