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

Unified Diff: media/remoting/remoting_renderer_factory.cc

Issue 2457563002: Media Remoting: Add remoting control logic for encrypted contents. (Closed)
Patch Set: Rebase Only. Created 4 years, 2 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
Index: media/remoting/remoting_renderer_factory.cc
diff --git a/media/remoting/remoting_renderer_factory.cc b/media/remoting/remoting_renderer_factory.cc
index 52a5db8859da5c087c7f4931e1f5b903e5afde1c..dc3315bb9ebc6d9850231e8f929a06d41131d5ba 100644
--- a/media/remoting/remoting_renderer_factory.cc
+++ b/media/remoting/remoting_renderer_factory.cc
@@ -10,7 +10,7 @@ namespace media {
RemotingRendererFactory::RemotingRendererFactory(
std::unique_ptr<RendererFactory> default_renderer_factory,
- std::unique_ptr<RemotingController> remoting_controller)
+ std::unique_ptr<RemotingRendererController> remoting_controller)
: default_renderer_factory_(std::move(default_renderer_factory)),
remoting_controller_(std::move(remoting_controller)) {}
@@ -22,7 +22,12 @@ 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_controller_ && remoting_controller_->IsTerminated()) {
xjz 2016/10/27 22:45:58 Done.
+ // TODO(xjz): Create the renderer that shows the failure page.
+ NOTIMPLEMENTED();
+ return std::unique_ptr<Renderer>();
+ } else if (remoting_controller_ &&
+ remoting_controller_->IsRenderingRemotely()) {
VLOG(1) << "Create Remoting renderer.";
// TODO(xjz): Merge this with Eric's implementation.
NOTIMPLEMENTED();

Powered by Google App Engine
This is Rietveld 408576698