Use VP8 over PseudoTCP by default.

remoting/host/chromoting_host.cc

 // Copyright (c) 2010 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/host/chromoting_host.h"
 
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
-#if defined(OS_WIN)
-#include "remoting/host/capturer_gdi.h"
-#include "remoting/host/event_executor_win.h"
-#elif defined(OS_LINUX)
-#include "remoting/host/capturer_linux.h"
-#include "remoting/host/event_executor_linux.h"
-#elif defined(OS_MACOSX)
-#include "remoting/host/capturer_mac.h"
-#include "remoting/host/event_executor_mac.h"
-#endif
 #include "remoting/base/encoder.h"
 #include "remoting/base/encoder_verbatim.h"
 #include "remoting/base/encoder_vp8.h"
 #include "remoting/base/encoder_zlib.h"
+#include "remoting/host/capturer.h"
 #include "remoting/host/chromoting_host_context.h"
+#include "remoting/host/event_executor.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/host_stub_fake.h"
 #include "remoting/host/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/session_config.h"
 
 using remoting::protocol::ConnectionToClient;
 
 namespace remoting {
 
-ChromotingHost::ChromotingHost(ChromotingHostContext* context,
-                               MutableHostConfig* config)
-    : context_(context),
-      config_(config),
-#if defined(OS_WIN)
-      capturer_(new remoting::CapturerGdi(
-          context->main_message_loop())),
-      input_stub_(new remoting::EventExecutorWin(
-          context->main_message_loop(), capturer_.get())),
-#elif defined(OS_LINUX)
-      capturer_(new remoting::CapturerLinux(
-          context->main_message_loop())),
-      input_stub_(new remoting::EventExecutorLinux(
-          context->main_message_loop(), capturer_.get())),
-#elif defined(OS_MACOSX)
-      capturer_(new remoting::CapturerMac(
-          context->main_message_loop())),
-      input_stub_(new remoting::EventExecutorMac(
-          context->main_message_loop(), capturer_.get())),
-#endif
-      host_stub_(new HostStubFake()),
-      state_(kInitial) {
+// static
+ChromotingHost* ChromotingHost::Create(ChromotingHostContext* context,
+                                       MutableHostConfig* config) {
+  return new ChromotingHost(
+      context, config,

[dmac, 2010/11/23 01:14:57]

any reason not to have these up on line 34?

[Sergey Ulanov, 2010/11/23 01:59:18]

Done.

+      Capturer::Create(context->main_message_loop()));
+}
+
+// static
+ChromotingHost* ChromotingHost::Create(ChromotingHostContext* context,
+                                       MutableHostConfig* config,
+                                       Capturer* capturer) {
+  return new ChromotingHost(context, config, capturer);
 }
 
 ChromotingHost::ChromotingHost(ChromotingHostContext* context,
                                MutableHostConfig* config, Capturer* capturer)
     : context_(context),
       config_(config),
       capturer_(capturer),
-#if defined(OS_WIN)
-      input_stub_(new remoting::EventExecutorWin(
+      input_stub_(EventExecutor::Create(
           context->main_message_loop(), capturer)),
-#elif defined(OS_LINUX)
-      input_stub_(new remoting::EventExecutorLinux(
-          context->main_message_loop(), capturer)),
-#elif defined(OS_MACOSX)
-      input_stub_(new remoting::EventExecutorMac(
-          context->main_message_loop(), capturer)),
-#endif
       host_stub_(new HostStubFake()),
-      state_(kInitial) {
+      state_(kInitial),
+      protocol_config_(protocol::CandidateSessionConfig::CreateDefault()) {
 }
 
+
 ChromotingHost::~ChromotingHost() {
 }
 
 void ChromotingHost::Start(Task* shutdown_task) {
   if (MessageLoop::current() != context_->main_message_loop()) {

[dmac, 2010/11/23 01:14:57]

DCHECK that protocol_config_ is set?

[Sergey Ulanov, 2010/11/23 01:59:18]

I've added DCHECK in set_protocol_config(). This guarantees that it is always
set.

     context_->main_message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &ChromotingHost::Start, shutdown_task));
     return;
   }
 
   DCHECK(!jingle_client_);
   DCHECK(shutdown_task);
 
   // Make sure this object is not started.
@@ skipping 189 matching lines @@
     *response = protocol::SessionManager::DECLINE;
     return;
   }
 
   // Check that the user has access to the host.
   if (!access_verifier_.VerifyPermissions(session->jid())) {
     *response = protocol::SessionManager::DECLINE;
     return;
   }
 
-  scoped_ptr<protocol::CandidateSessionConfig>
-      local_config(protocol::CandidateSessionConfig::CreateDefault());
-  local_config->SetInitialResolution(
-      protocol::ScreenResolution(capturer_->width(), capturer_->height()));
+  *protocol_config_->mutable_initial_resolution() =
+      protocol::ScreenResolution(capturer_->width(), capturer_->height());
   // TODO(sergeyu): Respect resolution requested by the client if supported.
-  protocol::SessionConfig* config = local_config->Select(
+  protocol::SessionConfig* config = protocol_config_->Select(
       session->candidate_config(), true /* force_host_resolution */);
 
   if (!config) {
     LOG(WARNING) << "Rejecting connection from " << session->jid()
                  << " because no compatible configuration has been found.";
     *response = protocol::SessionManager::INCOMPATIBLE;
     return;
   }
 
   session->set_config(config);
 
   *response = protocol::SessionManager::ACCEPT;
 
   VLOG(1) << "Client connected: " << session->jid();
 
   // If we accept the connected then create a client object and set the
   // callback.
   connection_ = new ConnectionToClient(context_->main_message_loop(),
                                        this, host_stub_.get(),
                                        input_stub_.get());
   connection_->Init(session);
 }
 
+void ChromotingHost::set_protocol_config(
+    protocol::CandidateSessionConfig* config) {
+  DCHECK_EQ(state_, kInitial);
+  protocol_config_.reset(config);
+}
+
 void ChromotingHost::OnServerClosed() {
   // Don't need to do anything here.
 }
 
 // TODO(sergeyu): Move this to SessionManager?
 Encoder* ChromotingHost::CreateEncoder(const protocol::SessionConfig* config) {
   const protocol::ChannelConfig& video_config = config->video_config();
 
   if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
     return new remoting::EncoderVerbatim();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_ZIP) {
     return new remoting::EncoderZlib();
   }
   // TODO(sergeyu): Enable VP8 on ARM builds.
 #if !defined(ARCH_CPU_ARM_FAMILY)
   else if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
     return new remoting::EncoderVp8();
   }
 #endif
 
   return NULL;
 }
 
 }  // namespace remoting