Fix failed capture handling in WebrtcVideoStream

remoting/protocol/webrtc_video_stream.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/protocol/webrtc_video_stream.h"
 
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 125 matching lines @@
 
 void WebrtcVideoStream::OnCaptureResult(
     webrtc::DesktopCapturer::Result result,
     std::unique_ptr<webrtc::DesktopFrame> frame) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   captured_frame_timestamps_->capture_ended_time = base::TimeTicks::Now();
   captured_frame_timestamps_->capture_delay =
       base::TimeDelta::FromMilliseconds(frame ? frame->capture_time_ms() : 0);
 
+  if (!frame) {
+    // Save event timestamps to be used for the next frame.
+    next_frame_input_event_timestamps_ =
+        captured_frame_timestamps_->input_event_timestamps;
+    captured_frame_timestamps_->input_event_timestamps = InputEventTimestamps();
+  }
+
   WebrtcVideoEncoder::FrameParams frame_params;
   if (!scheduler_->OnFrameCaptured(frame.get(), &frame_params)) {
     return;
   }
 
   // TODO(sergeyu): Handle ERROR_PERMANENT result here.
   if (frame) {
     webrtc::DesktopVector dpi =
         frame->dpi().is_zero() ? webrtc::DesktopVector(kDefaultDpi, kDefaultDpi)
                                : frame->dpi();
 
     if (!frame_size_.equals(frame->size()) || !frame_dpi_.equals(dpi)) {
       frame_size_ = frame->size();
       frame_dpi_ = dpi;
       if (observer_)
         observer_->OnVideoSizeChanged(this, frame_size_, frame_dpi_);
     }
-  } else {
-    // Save event timestamps to be used for the next frame.
-    next_frame_input_event_timestamps_ =
-        captured_frame_timestamps_->input_event_timestamps;
-    captured_frame_timestamps_->input_event_timestamps = InputEventTimestamps();
   }
 
   base::PostTaskAndReplyWithResult(
       encode_task_runner_.get(), FROM_HERE,
       base::Bind(&WebrtcVideoStream::EncodeFrame, encoder_.get(),
                  base::Passed(std::move(frame)), frame_params,
                  base::Passed(std::move(captured_frame_timestamps_))),
       base::Bind(&WebrtcVideoStream::OnFrameEncoded,
                  weak_factory_.GetWeakPtr()));
 }
@@ skipping 83 matching lines @@
 
     stats.encode_delay = frame.timestamps->encode_ended_time -
                          frame.timestamps->encode_started_time;
 
     video_stats_dispatcher_.OnVideoFrameStats(result.frame_id, stats);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting