Cleanup VideoFramePump.

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 "base/message_loop/message_loop_proxy.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/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vpx.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/audio_scheduler.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_shape_pump.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/host/video_frame_pump.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 "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
+#include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
 
 // Default DPI to assume for old clients that use notifyClientDimensions.
 const int kDefaultDPI = 96;
 
 namespace remoting {
 
 ClientSession::ClientSession(
     EventHandler* event_handler,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
@@ skipping 93 matching lines @@
 
 void ClientSession::ControlVideo(const protocol::VideoControl& video_control) {
   DCHECK(CalledOnValidThread());
 
   // Note that |video_frame_pump_| may be null, depending upon whether
   // extensions choose to wrap or "steal" the video capturer or encoder.
   if (video_control.has_enable()) {
     VLOG(1) << "Received VideoControl (enable="
             << video_control.enable() << ")";
     pause_video_ = !video_control.enable();
-    if (video_frame_pump_.get())
+    if (video_frame_pump_)
       video_frame_pump_->Pause(pause_video_);
   }
   if (video_control.has_lossless_encode()) {
     VLOG(1) << "Received VideoControl (lossless_encode="
             << video_control.lossless_encode() << ")";
     lossless_video_encode_ = video_control.lossless_encode();
-    if (video_frame_pump_.get())
+    if (video_frame_pump_)
       video_frame_pump_->SetLosslessEncode(lossless_video_encode_);
   }
   if (video_control.has_lossless_color()) {
     VLOG(1) << "Received VideoControl (lossless_color="
             << video_control.lossless_color() << ")";
     lossless_video_color_ = video_control.lossless_color();
-    if (video_frame_pump_.get())
+    if (video_frame_pump_)
       video_frame_pump_->SetLosslessColor(lossless_video_color_);
   }
 }
 
 void ClientSession::ControlAudio(const protocol::AudioControl& audio_control) {
   DCHECK(CalledOnValidThread());
 
   if (audio_control.has_enable()) {
     VLOG(1) << "Received AudioControl (enable="
             << audio_control.enable() << ")";
@@ skipping 191 matching lines @@
 
   // Ensure that any pressed keys or buttons are released.
   input_tracker_.ReleaseAll();
 
   // Stop components access the client, audio or video stubs, which are no
   // longer valid once ConnectionToClient calls OnConnectionClosed().
   if (audio_scheduler_.get()) {
     audio_scheduler_->Stop();
     audio_scheduler_ = nullptr;
   }
-  if (video_frame_pump_.get()) {
-    video_frame_pump_->Stop();
-    video_frame_pump_ = nullptr;
-  }
+
+  video_frame_pump_.reset();
+  mouse_shape_pump_.reset();
 
   client_clipboard_factory_.InvalidateWeakPtrs();
   input_injector_.reset();
   screen_controls_.reset();
   desktop_environment_.reset();
 
   // Notify the ChromotingHost that this client is disconnected.
   // TODO(sergeyu): Log failure reason?
   event_handler_->OnSessionClosed(this);
 }
@@ skipping 42 matching lines @@
   if (disable_inputs)
     input_tracker_.ReleaseAll();
 
   disable_input_filter_.set_enabled(!disable_inputs);
   disable_clipboard_filter_.set_enabled(!disable_inputs);
 }
 
 void ClientSession::ResetVideoPipeline() {
   DCHECK(CalledOnValidThread());
 
-  if (video_frame_pump_.get()) {
-    video_frame_pump_->Stop();
-    video_frame_pump_ = nullptr;
-  }
+  mouse_shape_pump_.reset();
+  video_frame_pump_.reset();
 
   // Create VideoEncoder and DesktopCapturer to match the session's video
   // channel configuration.
   scoped_ptr<webrtc::DesktopCapturer> video_capturer =
       desktop_environment_->CreateVideoCapturer();
   extension_manager_->OnCreateVideoCapturer(&video_capturer);
   scoped_ptr<VideoEncoder> video_encoder =
       CreateVideoEncoder(connection_->session()->config());
   extension_manager_->OnCreateVideoEncoder(&video_encoder);
 
   // Don't start the VideoFramePump if either capturer or encoder are missing.
   if (!video_capturer || !video_encoder)
     return;
 
-  // Create a VideoFramePump to pump frames from the capturer to the client.
-  video_frame_pump_ = new VideoFramePump(
-      video_capture_task_runner_,
-      video_encode_task_runner_,
-      network_task_runner_,
-      video_capturer.Pass(),
-      desktop_environment_->CreateMouseCursorMonitor(),
-      video_encoder.Pass(),
-      connection_->client_stub(),
-      &mouse_clamping_filter_);
+  // Create MouseShapePump to send mouse cursor shape.
+  mouse_shape_pump_.reset(
+      new MouseShapePump(video_capture_task_runner_,
+                         desktop_environment_->CreateMouseCursorMonitor(),
+                         connection_->client_stub()));
+
+  // Create a VideoFramePump 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<DesktopCapturerProxy> capturer_proxy(new DesktopCapturerProxy(
+      video_capture_task_runner_, video_capturer.Pass()));
+  video_frame_pump_.reset(
+      new VideoFramePump(video_encode_task_runner_, capturer_proxy.Pass(),
+                         video_encoder.Pass(), &mouse_clamping_filter_));
 
   // Apply video-control parameters to the new scheduler.
   video_frame_pump_->SetLosslessEncode(lossless_video_encode_);
   video_frame_pump_->SetLosslessColor(lossless_video_color_);
 
-  // Start capturing the screen.
-  video_frame_pump_->Start();
-
   // Pause capturing if necessary.
   video_frame_pump_->Pause(pause_video_);
 }
 
 void ClientSession::SetGnubbyAuthHandlerForTesting(
     GnubbyAuthHandler* gnubby_auth_handler) {
   DCHECK(CalledOnValidThread());
   gnubby_auth_handler_.reset(gnubby_auth_handler);
 }
 
@@ skipping 32 matching lines @@
     return make_scoped_ptr(new AudioEncoderVerbatim());
   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
     return make_scoped_ptr(new AudioEncoderOpus());
   }
 
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace remoting