WIP - Add EME

media/remoting/remoting_renderer_factory.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/remoting/remoting_renderer_factory.h"
 
 #include "base/logging.h"
 
 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)) {}
 
 RemotingRendererFactory::~RemotingRendererFactory() {}
 
 std::unique_ptr<Renderer> RemotingRendererFactory::CreateRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
     const scoped_refptr<base::TaskRunner>& worker_task_runner,
     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_->IsRemoting() ||
+                               remoting_controller_->IsTerminated())) {

[miu, 2016/10/25 04:21:26]

Seems like this should be:

  if (remoting_controller_ &&
      remoting_controller_->IsRemoting() &&
      !remoting_controller_->IsTerminated()) {

Rather than having two separate IsRemoting() and IsTerminated() methods, you
might just combine them and rename to something like IsRenderingRemotely().

[xjz, 2016/10/26 22:00:27]

Renamed IsRemoting() to IsRenderingRemotely(). I originally thought that we
should switch to remoting renderer if remoting session is started or is
permanently terminated. On a second thought, I think for the latter, we may just
create a separate renderer to only render that failure page (with apacible's
change). So now I separated the two cases. WDYT?

     VLOG(1) << "Create Remoting renderer.";
     // TODO(xjz): Merge this with Eric's implementation.
     NOTIMPLEMENTED();
     return std::unique_ptr<Renderer>();
   } else {
     VLOG(1) << "Create Local playback renderer.";
     return default_renderer_factory_->CreateRenderer(
         media_task_runner, worker_task_runner, audio_renderer_sink,
         video_renderer_sink, request_surface_cb);
   }
 }
 
 }  // namespace media