Use IpcVideoFrameCapturer on network thread instead of capturer thread.

remoting/host/client_session.cc

 // Copyright (c) 2012 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/client_session.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "remoting/base/capabilities.h"
 #include "remoting/base/logging.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/codec/audio_encoder_opus.h"
 #include "remoting/codec/audio_encoder_verbatim.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/audio_pump.h"
-#include "remoting/host/desktop_capturer_proxy.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_extension_session.h"
 #include "remoting/host/input_injector.h"
-#include "remoting/host/mouse_cursor_monitor_proxy.h"
 #include "remoting/host/mouse_shape_pump.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_thread_proxy.h"
 #include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
@@ skipping 22 matching lines @@
 
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace
 
 ClientSession::ClientSession(
     EventHandler* event_handler,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
     scoped_ptr<protocol::ConnectionToClient> connection,
     DesktopEnvironmentFactory* desktop_environment_factory,
     const base::TimeDelta& max_duration,
     scoped_refptr<protocol::PairingRegistry> pairing_registry,
     const std::vector<HostExtension*>& extensions)
     : event_handler_(event_handler),
       connection_(std::move(connection)),
       client_jid_(connection_->session()->jid()),
       desktop_environment_factory_(desktop_environment_factory),
       input_tracker_(&host_input_filter_),
       remote_input_filter_(&input_tracker_),
       mouse_clamping_filter_(&remote_input_filter_),
       disable_input_filter_(&mouse_clamping_filter_),
       disable_clipboard_filter_(clipboard_echo_filter_.host_filter()),
       client_clipboard_factory_(clipboard_echo_filter_.client_filter()),
       max_duration_(max_duration),
       audio_task_runner_(audio_task_runner),
-      input_task_runner_(input_task_runner),
-      video_capture_task_runner_(video_capture_task_runner),
-      video_encode_task_runner_(video_encode_task_runner),
-      network_task_runner_(network_task_runner),
-      ui_task_runner_(ui_task_runner),
       pairing_registry_(pairing_registry),
       is_authenticated_(false),
       pause_video_(false),
       lossless_video_encode_(false),
       // Note that |lossless_video_color_| defaults to true, but actually only
       // controls VP9 video stream color quality.
       lossless_video_color_(!base::CommandLine::ForCurrentProcess()->HasSwitch(
           kDisableI444SwitchName)),
       weak_factory_(this) {
   connection_->SetEventHandler(this);
@@ skipping 343 matching lines @@
   scoped_ptr<webrtc::DesktopCapturer> video_capturer =
       desktop_environment_->CreateVideoCapturer();
   extension_manager_->OnCreateVideoCapturer(&video_capturer);
 
   // Don't start the video stream if the extension took ownership of the
   // capturer.
   if (!video_capturer)
     return;
 
   // Create MouseShapePump to send mouse cursor shape.
-  // TODO(sergeyu): Move MouseCursorMonitorProxy creation to DesktopEnvironment.
-  // When using IpcDesktopCapturer the capture thread is not useful.
   mouse_shape_pump_.reset(
-      new MouseShapePump(make_scoped_ptr(new MouseCursorMonitorProxy(
-                             video_capture_task_runner_,
-                             desktop_environment_->CreateMouseCursorMonitor())),
+      new MouseShapePump(desktop_environment_->CreateMouseCursorMonitor(),
                          connection_->client_stub()));
 
   // Create a VideoStream to pump frames from the capturer to the client.
-  // TODO(sergeyu): Move DesktopCapturerProxy creation to DesktopEnvironment.
-  // When using IpcDesktopCapturer the capture thread is not useful.
-  scoped_ptr<webrtc::DesktopCapturer> capturer_proxy(new DesktopCapturerProxy(
-      video_capture_task_runner_, std::move(video_capturer)));
+  video_stream_ = connection_->StartVideoStream(std::move(video_capturer));
 
-  video_stream_ = connection_->StartVideoStream(std::move(capturer_proxy));
   video_stream_->SetSizeCallback(
       base::Bind(&ClientSession::OnScreenSizeChanged, base::Unretained(this)));
 
   // Apply video-control parameters to the new stream.
   video_stream_->SetLosslessEncode(lossless_video_encode_);
   video_stream_->SetLosslessColor(lossless_video_color_);
 
   // Pause capturing if necessary.
   video_stream_->Pause(pause_video_);
 }
@@ skipping 12 matching lines @@
                                          base::ThreadTaskRunnerHandle::Get()));
 }
 
 void ClientSession::OnScreenSizeChanged(const webrtc::DesktopSize& size) {
   DCHECK(CalledOnValidThread());
   mouse_clamping_filter_.set_input_size(size);
   mouse_clamping_filter_.set_output_size(size);
 }
 
 }  // namespace remoting