Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / remoting / protocol / connection_to_host.cc

diff --git a/src/remoting/protocol/connection_to_host.cc b/src/remoting/protocol/connection_to_host.cc
index cdaf4b6..d2ce7ff 100644 (file)
--- a/src/remoting/protocol/connection_to_host.cc
+++ b/src/remoting/protocol/connection_to_host.cc
@@ -22,7 +22,6 @@
 #include "remoting/protocol/transport.h"
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
-#include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
@@ -33,7 +32,6 @@ ConnectionToHost::ConnectionToHost(
       event_callback_(NULL),
       client_stub_(NULL),
       clipboard_stub_(NULL),
-      video_stub_(NULL),
       audio_stub_(NULL),
       signal_strategy_(NULL),
       state_(INITIALIZING),
@@ -80,7 +78,12 @@ void ConnectionToHost::Connect(SignalStrategy* signal_strategy,
   event_callback_ = event_callback;
   client_stub_ = client_stub;
   clipboard_stub_ = clipboard_stub;
-  video_stub_ = video_stub;
+  monitored_video_stub_.reset(new MonitoredVideoStub(
+      video_stub,
+      base::TimeDelta::FromSeconds(
+          MonitoredVideoStub::kConnectivityCheckDelaySeconds),
+      base::Bind(&ConnectionToHost::OnVideoChannelStatus,
+                 base::Unretained(this))));
   audio_stub_ = audio_stub;
   authenticator_ = authenticator.Pass();
 
@@ -152,6 +155,7 @@ void ConnectionToHost::OnSessionStateChange(
     case Session::CONNECTING:
     case Session::ACCEPTING:
     case Session::CONNECTED:
+    case Session::AUTHENTICATING:
       // Don't care about these events.
       break;
 
@@ -173,15 +177,15 @@ void ConnectionToHost::OnSessionStateChange(
                      base::Unretained(this)));
 
       video_reader_ = VideoReader::Create(session_->config());
-      video_reader_->Init(session_.get(), video_stub_, base::Bind(
-          &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
+      video_reader_->Init(session_.get(), monitored_video_stub_.get(),
+                          base::Bind(&ConnectionToHost::OnChannelInitialized,
+                                     base::Unretained(this)));
 
       audio_reader_ = AudioReader::Create(session_->config());
       if (audio_reader_.get()) {
-        audio_reader_->Init(
-            session_.get(), session_->config().audio_config(),
-            base::Bind(&ConnectionToHost::OnChannelInitialized,
-                       base::Unretained(this)));
+        audio_reader_->Init(session_.get(), session_->config().audio_config(),
+                            base::Bind(&ConnectionToHost::OnChannelInitialized,
+                                       base::Unretained(this)));
         audio_reader_->set_audio_stub(audio_stub_);
       }
       break;
@@ -215,15 +219,8 @@ void ConnectionToHost::OnSessionRouteChange(const std::string& channel_name,
   event_callback_->OnRouteChanged(channel_name, route);
 }
 
-void ConnectionToHost::OnSessionChannelReady(const std::string& channel_name,
-                                             bool ready) {
-  if (ready) {
-    not_ready_channels_.erase(channel_name);
-  } else if (!ready) {
-    not_ready_channels_.insert(channel_name);
-  }
-
-  event_callback_->OnConnectionReady(not_ready_channels_.empty());
+void ConnectionToHost::OnVideoChannelStatus(bool active) {
+  event_callback_->OnConnectionReady(active);
 }
 
 ConnectionToHost::State ConnectionToHost::state() const {