Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Unified Diff: remoting/protocol/webrtc_video_stream.cc

Issue 2757923004: Fix failed capture handling in WebrtcVideoStream (Closed)
Patch Set: . Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/protocol/webrtc_video_stream.cc
diff --git a/remoting/protocol/webrtc_video_stream.cc b/remoting/protocol/webrtc_video_stream.cc
index 7450fb5cc04af6b8d5a3aacb4a0ba607ea208ffa..8c2478bf7b1fd0ce525d646143071d111bd8f423 100644
--- a/remoting/protocol/webrtc_video_stream.cc
+++ b/remoting/protocol/webrtc_video_stream.cc
@@ -160,11 +160,6 @@ void WebrtcVideoStream::OnCaptureResult(
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(
@@ -191,15 +186,8 @@ void WebrtcVideoStream::CaptureNextFrame() {
captured_frame_timestamps_.reset(new FrameTimestamps());
captured_frame_timestamps_->capture_started_time = base::TimeTicks::Now();
-
- if (!next_frame_input_event_timestamps_.is_null()) {
- captured_frame_timestamps_->input_event_timestamps =
- next_frame_input_event_timestamps_;
- next_frame_input_event_timestamps_ = InputEventTimestamps();
- } else if (event_timestamps_source_) {
- captured_frame_timestamps_->input_event_timestamps =
- event_timestamps_source_->TakeLastEventTimestamps();
- }
+ captured_frame_timestamps_->input_event_timestamps =
+ event_timestamps_source_->TakeLastEventTimestamps();
capturer_->CaptureFrame();
}
« remoting/protocol/webrtc_frame_scheduler_simple.cc ('K') | « remoting/protocol/webrtc_video_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698