Pass VideoRenderer interface to ConnectionToHost.

remoting/protocol/ice_connection_to_host.cc

 // Copyright 2015 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 "remoting/protocol/ice_connection_to_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/audio_reader.h"
 #include "remoting/protocol/audio_stub.h"
 #include "remoting/protocol/auth_util.h"
 #include "remoting/protocol/client_control_dispatcher.h"
 #include "remoting/protocol/client_event_dispatcher.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/client_video_dispatcher.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/ice_transport.h"
 #include "remoting/protocol/transport_context.h"
-#include "remoting/protocol/video_stub.h"
+#include "remoting/protocol/video_renderer.h"
 
 namespace remoting {
 namespace protocol {
 
 IceConnectionToHost::IceConnectionToHost() {}
 IceConnectionToHost::~IceConnectionToHost() {}
 
 void IceConnectionToHost::Connect(
     scoped_ptr<Session> session,
     scoped_refptr<TransportContext> transport_context,
     HostEventCallback* event_callback) {
   DCHECK(client_stub_);
   DCHECK(clipboard_stub_);
-  DCHECK(monitored_video_stub_);
+  DCHECK(video_renderer_);
 
   transport_.reset(new IceTransport(transport_context, this));
 
   session_ = std::move(session);
   session_->SetEventHandler(this);
   session_->SetTransport(transport_.get());
 
   event_callback_ = event_callback;
 
   SetState(CONNECTING, OK);
@@ skipping 17 matching lines @@
 }
 
 void IceConnectionToHost::set_client_stub(ClientStub* client_stub) {
   client_stub_ = client_stub;
 }
 
 void IceConnectionToHost::set_clipboard_stub(ClipboardStub* clipboard_stub) {
   clipboard_stub_ = clipboard_stub;
 }
 
-void IceConnectionToHost::set_video_stub(VideoStub* video_stub) {
-  DCHECK(video_stub);
-  monitored_video_stub_.reset(new MonitoredVideoStub(
-      video_stub, base::TimeDelta::FromSeconds(
-                      MonitoredVideoStub::kConnectivityCheckDelaySeconds),
-      base::Bind(&IceConnectionToHost::OnVideoChannelStatus,
-                 base::Unretained(this))));
+void IceConnectionToHost::set_video_renderer(VideoRenderer* video_renderer) {
+  DCHECK(video_renderer);
+  DCHECK(!monitored_video_stub_);
+  video_renderer_ = video_renderer;
 }
 
 void IceConnectionToHost::set_audio_stub(AudioStub* audio_stub) {
   audio_stub_ = audio_stub;
 }
 
 void IceConnectionToHost::OnSessionStateChange(Session::State state) {
   DCHECK(CalledOnValidThread());
   DCHECK(event_callback_);
 
   switch (state) {
     case Session::INITIALIZING:
     case Session::CONNECTING:
     case Session::ACCEPTING:
     case Session::ACCEPTED:
     case Session::AUTHENTICATING:
       // Don't care about these events.
       break;
 
     case Session::AUTHENTICATED:
       SetState(AUTHENTICATED, OK);
+
+      // Setup control channel.
       control_dispatcher_.reset(new ClientControlDispatcher());
       control_dispatcher_->Init(transport_->GetMultiplexedChannelFactory(),
                                 this);
       control_dispatcher_->set_client_stub(client_stub_);
       control_dispatcher_->set_clipboard_stub(clipboard_stub_);
 
+      // Setup event channel.
       event_dispatcher_.reset(new ClientEventDispatcher());
       event_dispatcher_->Init(transport_->GetMultiplexedChannelFactory(), this);
 
+      // Configure video pipeline.
+      video_renderer_->OnSessionConfig(session_->config());
+      monitored_video_stub_.reset(new MonitoredVideoStub(
+          video_renderer_->GetVideoStub(),
+          base::TimeDelta::FromSeconds(
+              MonitoredVideoStub::kConnectivityCheckDelaySeconds),
+          base::Bind(&IceConnectionToHost::OnVideoChannelStatus,
+                     base::Unretained(this))));
       video_dispatcher_.reset(
           new ClientVideoDispatcher(monitored_video_stub_.get()));
       video_dispatcher_->Init(transport_->GetStreamChannelFactory(), this);
 
+      // Configure audio pipeline if necessary.
       if (session_->config().is_audio_enabled()) {
         audio_reader_.reset(new AudioReader(audio_stub_));
         audio_reader_->Init(transport_->GetMultiplexedChannelFactory(), this);
       }
       break;
 
     case Session::CLOSED:
       CloseChannels();
       SetState(CLOSED, OK);
       break;
@@ skipping 89 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting