Merge 272790 "More reliable keep-alive video packets."

remoting/host/video_scheduler.h

Index: remoting/host/video_scheduler.h
===================================================================
--- remoting/host/video_scheduler.h	(revision 273938)
+++ remoting/host/video_scheduler.h	(working copy)
@@ -140,8 +140,14 @@
 
   // Callback passed to |video_stub_| for the last packet in each frame, to
   // rate-limit frame captures to network throughput.
-  void VideoFrameSentCallback();
+  void OnVideoPacketSent();
 
+  // Called by |keep_alive_timer_|.
+  void SendKeepAlivePacket();
+
+  // Callback for |video_stub_| called after a keep-alive packet is sent.
+  void OnKeepAlivePacketSent();
+
   // Send updated cursor shape to client.
   void SendCursorShape(scoped_ptr<protocol::CursorShapeInfo> cursor_shape);
 
@@ -173,6 +179,10 @@
   // Timer used to schedule CaptureNextFrame().
   scoped_ptr<base::OneShotTimer<VideoScheduler> > capture_timer_;
 
+  // Timer used to ensure that we send empty keep-alive frames to the client
+  // even when the video stream is paused or encoder is busy.
+  scoped_ptr<base::DelayTimer<VideoScheduler> > keep_alive_timer_;
+
   // The number of frames being processed, i.e. frames that we are currently
   // capturing, encoding or sending. The value is capped at 2 to minimize
   // latency.