Implement video frame acknowledgements in the chromoting protocol.

remoting/host/video_frame_pump.h

 // Copyright 2015 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_VIDEO_FRAME_PUMP_H_
 #define REMOTING_HOST_VIDEO_FRAME_PUMP_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/host/capture_scheduler.h"
 #include "remoting/proto/video.pb.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace remoting {
 
 namespace protocol {
+class VideoFeedbackStub;
 class VideoStub;
 }  // namespace protocol
 
 // Class responsible for scheduling frame captures from a screen capturer.,
 // delivering them to a VideoEncoder to encode, and
 // finally passing the encoded video packets to the specified VideoStub to send
 // on the network.
 //
 // THREADING
 //
@@ skipping 47 matching lines @@
 
   // Updates event timestamp from the last event received from the client. This
   // value is sent back to the client for roundtrip latency estimates.
   void SetLatestEventTimestamp(int64 latest_event_timestamp);
 
   // Sets whether the video encoder should be requested to encode losslessly,
   // or to use a lossless color space (typically requiring higher bandwidth).
   void SetLosslessEncode(bool want_lossless);
   void SetLosslessColor(bool want_lossless);
 
+  protocol::VideoFeedbackStub* video_feedback_stub() {
+    return &capture_scheduler_;
+  }
+
  private:
   // webrtc::DesktopCapturer::Callback interface.
   webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
   void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
 
   // Callback for CaptureScheduler.
   void CaptureNextFrame();
 
   // Sends encoded frame
   void SendEncodedFrame(int64 latest_event_timestamp,
                         base::TimeTicks timestamp,
                         scoped_ptr<VideoPacket> packet);
 
-  // Callback passed to |video_stub_| for the last packet in each frame, to
-  // rate-limit frame captures to network throughput.
+  // Callback passed to |video_stub_|.
   void OnVideoPacketSent();
 
   // Called by |keep_alive_timer_|.
   void SendKeepAlivePacket();
 
   // Callback for |video_stub_| called after a keep-alive packet is sent.
   void OnKeepAlivePacketSent();
 
   base::ThreadChecker thread_checker_;

[Wez, 2015/02/21 03:12:02]

nit: I'd suggest putting this just before the WeakPtrFactory, since it's not
really part of the core logic of this class, just a tool for sanity-checking the
class' behaviour.

[Sergey Ulanov, 2015/02/23 17:35:38]

Done.

 
   // Task runner used to run |encoder_|.
   scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner_;
 
   // Capturer used to capture the screen.
   scoped_ptr<webrtc::DesktopCapturer> capturer_;
 
   // Used to encode captured frames. Always accessed on the encode thread.
   scoped_ptr<VideoEncoder> encoder_;
 
@@ skipping 12 matching lines @@
   int64 latest_event_timestamp_;
 
   base::WeakPtrFactory<VideoFramePump> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoFramePump);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_VIDEO_FRAME_PUMP_H_