Fix VideoFramePump to send keep-alive packets only after the first real frame.

remoting/host/video_frame_pump.cc

 // 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.
 
 #include "remoting/host/video_frame_pump.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 42 matching lines @@
 
 VideoFramePump::VideoFramePump(
     scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner,
     scoped_ptr<webrtc::DesktopCapturer> capturer,
     scoped_ptr<VideoEncoder> encoder,
     protocol::VideoStub* video_stub)
     : encode_task_runner_(encode_task_runner),
       capturer_(capturer.Pass()),
       encoder_(encoder.Pass()),
       video_stub_(video_stub),
-      keep_alive_timer_(true, true),
+      keep_alive_timer_(
+          FROM_HERE,
+          base::TimeDelta::FromMilliseconds(kKeepAlivePacketIntervalMs),
+          base::Bind(&VideoFramePump::SendKeepAlivePacket,
+                     base::Unretained(this)),
+          false),

[Wez, 2015/02/18 22:59:35]

You've changed this from repeating to non-repeating - was that intentional?

[Sergey Ulanov, 2015/02/18 23:31:41]

Yes - it's mentioned in the CL description. It's not necessary to fix the bug,
but I think it needs to be fixed.

       capture_scheduler_(base::Bind(&VideoFramePump::CaptureNextFrame,
                                     base::Unretained(this))),
       latest_event_timestamp_(0),
       weak_factory_(this) {
   DCHECK(encoder_);
   DCHECK(video_stub_);
 
   capturer_->Start(this);
   capture_scheduler_.Start();
-
-  keep_alive_timer_.Start(
-      FROM_HERE, base::TimeDelta::FromMilliseconds(kKeepAlivePacketIntervalMs),
-      base::Bind(&VideoFramePump::SendKeepAlivePacket, base::Unretained(this)));
 }
 
 VideoFramePump::~VideoFramePump() {
   encode_task_runner_->DeleteSoon(FROM_HERE, encoder_.release());
 }
 
 void VideoFramePump::Pause(bool pause) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   capture_scheduler_.Pause(pause);
@@ skipping 82 matching lines @@
                  weak_factory_.GetWeakPtr()));
 }
 
 void VideoFramePump::OnKeepAlivePacketSent() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   keep_alive_timer_.Reset();
 }
 
 }  // namespace remoting