Use webrtc::DesktopCapturer for screen capturer implementation.

remoting/host/desktop_session_agent.h

 // 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.
 
 #ifndef REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
 
-#include <list>
+#include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_platform_file.h"
 #include "media/video/capture/screen/screen_capturer.h"
-#include "media/video/capture/screen/shared_buffer.h"
 #include "remoting/host/client_session_control.h"
 #include "remoting/protocol/clipboard_stub.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/skia/include/core/SkSize.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace IPC {
 class ChannelProxy;
 class Message;
 }  // namespace IPC
 
 namespace remoting {
 
 class AudioCapturer;
 class AudioPacket;
 class AutoThreadTaskRunner;
 class DesktopEnvironment;
 class DesktopEnvironmentFactory;
 class InputInjector;
 class RemoteInputFilter;
 class ScreenControls;
 class ScreenResolution;
 
 namespace protocol {
 class InputEventTracker;
 }  // namespace protocol
 
 // Provides screen/audio capturing and input injection services for
 // the network process.
 class DesktopSessionAgent
     : public base::RefCountedThreadSafe<DesktopSessionAgent>,
       public IPC::Listener,
-      public media::ScreenCapturer::Delegate,
+      public webrtc::DesktopCapturer::Callback,
+      public media::ScreenCapturer::MouseShapeObserver,
       public ClientSessionControl {
  public:
   class Delegate {
    public:
     virtual ~Delegate();
 
     // Returns an instance of desktop environment factory used.
     virtual DesktopEnvironmentFactory& desktop_environment_factory() = 0;
 
     // Notifies the delegate that the network-to-desktop channel has been
     // disconnected.
     virtual void OnNetworkProcessDisconnected() = 0;
   };
 
   static scoped_refptr<DesktopSessionAgent> Create(
       scoped_refptr<AutoThreadTaskRunner> audio_capture_task_runner,
       scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
       scoped_refptr<AutoThreadTaskRunner> input_task_runner,
       scoped_refptr<AutoThreadTaskRunner> io_task_runner,
       scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner);
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
-  // media::ScreenCapturer::Delegate implementation.
-  virtual scoped_refptr<media::SharedBuffer> CreateSharedBuffer(
-      uint32 size) OVERRIDE;
-  virtual void ReleaseSharedBuffer(
-      scoped_refptr<media::SharedBuffer> buffer) OVERRIDE;
-  virtual void OnCaptureCompleted(
-      scoped_refptr<media::ScreenCaptureData> capture_data) OVERRIDE;
+  // webrtc::DesktopCapturer::Callback implementation.
+  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
+  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;
+
+  // media::ScreenCapturer::MouseShapeObserver implementation.
   virtual void OnCursorShapeChanged(
       scoped_ptr<media::MouseCursorShape> cursor_shape) OVERRIDE;
 
   // Forwards a local clipboard event though the IPC channel to the network
   // process.
   void InjectClipboardEvent(const protocol::ClipboardEvent& event);
 
   // Forwards an audio packet though the IPC channel to the network process.
   void ProcessAudioPacket(scoped_ptr<AudioPacket> packet);
 
   // Creates desktop integration components and a connected IPC channel to be
   // used to access them. The client end of the channel is returned in
   // the variable pointed by |desktop_pipe_out|.
   bool Start(const base::WeakPtr<Delegate>& delegate,
              IPC::PlatformFileForTransit* desktop_pipe_out);
 
   // Stops the agent asynchronously.
   void Stop();
 
  protected:
+  friend class base::RefCountedThreadSafe<DesktopSessionAgent>;
+
   DesktopSessionAgent(
       scoped_refptr<AutoThreadTaskRunner> audio_capture_task_runner,
       scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
       scoped_refptr<AutoThreadTaskRunner> input_task_runner,
       scoped_refptr<AutoThreadTaskRunner> io_task_runner,
       scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner);
-
-  friend class base::RefCountedThreadSafe<DesktopSessionAgent>;
   virtual ~DesktopSessionAgent();
 
   // ClientSessionControl interface.
   virtual const std::string& client_jid() const OVERRIDE;
   virtual void DisconnectSession() OVERRIDE;
   virtual void OnLocalMouseMoved(const SkIPoint& position) OVERRIDE;
   virtual void SetDisableInputs(bool disable_inputs) OVERRIDE;
 
   // Creates a connected IPC channel to be used to access the screen/audio
   // recorders and input stubs.
@@ skipping 55 matching lines @@
 
   scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner() const {
     return video_capture_task_runner_;
   }
 
   const base::WeakPtr<Delegate>& delegate() const {
     return delegate_;
   }
 
  private:
+  class SharedBuffer;
+  friend class SharedBuffer;
+
+  // Called by SharedBuffer when it's destroyed.
+  void OnSharedBufferDeleted(int id);
+
   // Closes |desktop_pipe_| if it is open.
   void CloseDesktopPipeHandle();
 
   // Task runner dedicated to running methods of |audio_capturer_|.
   scoped_refptr<AutoThreadTaskRunner> audio_capture_task_runner_;
 
   // Task runner on which public methods of this class should be called.
   scoped_refptr<AutoThreadTaskRunner> caller_task_runner_;
 
   // Task runner on which keyboard/mouse input is injected.
@@ skipping 31 matching lines @@
   scoped_ptr<ScreenControls> screen_controls_;
 
   // IPC channel connecting the desktop process with the network process.
   scoped_ptr<IPC::ChannelProxy> network_channel_;
 
   // The client end of the network-to-desktop pipe. It is kept alive until
   // the network process connects to the pipe.
   IPC::PlatformFileForTransit desktop_pipe_;
 
   // Size of the most recent captured video frame.
-  SkISize current_size_;
+  webrtc::DesktopSize current_size_;
 
   // Next shared buffer ID to be used.
   int next_shared_buffer_id_;
 
-  // List of the shared buffers.
-  typedef std::list<scoped_refptr<media::SharedBuffer> > SharedBuffers;
-  SharedBuffers shared_buffers_;
+  // Number of currently allocated shared buffers.

[alexeypa (please no reviews), 2013/05/08 22:24:59]

nit: The number

[Sergey Ulanov, 2013/05/09 18:49:02]

Done.

+  int shared_buffers_;
 
   // True if the desktop session agent has been started.
   bool started_;
 
   // Captures the screen.
   scoped_ptr<media::ScreenCapturer> video_capturer_;
 
+  // Keep reference to the last frame sent to make sure shared buffer is alive
+  // before it's received.
+  scoped_ptr<webrtc::DesktopFrame> last_frame_;
+
   DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_