Index: remoting/protocol/video_frame_pump.h |
diff --git a/remoting/protocol/video_frame_pump.h b/remoting/protocol/video_frame_pump.h |
index 5483400c8f9294b53fe39c2427b86b728dd652c2..bf78409ee355ed7ff4aa32c0ce5c7532f91a1c2a 100644 |
--- a/remoting/protocol/video_frame_pump.h |
+++ b/remoting/protocol/video_frame_pump.h |
@@ -80,8 +80,9 @@ class VideoFramePump : public VideoStream, |
~VideoFramePump() override; |
// VideoStream interface. |
+ void SetEventTimestampSource( |
+ scoped_refptr<InputEventTimestampSource> event_timestamp_source) override; |
void Pause(bool pause) override; |
- void OnInputEventReceived(int64_t event_timestamp) override; |
void SetLosslessEncode(bool want_lossless) override; |
void SetLosslessColor(bool want_lossless) override; |
void SetObserver(Observer* observer) override; |
@@ -95,12 +96,9 @@ class VideoFramePump : public VideoStream, |
FrameTimestamps(); |
~FrameTimestamps(); |
- // The following two fields are set only for one frame after each incoming |
- // input event. |input_event_client_timestamp| is event timestamp |
- // received from the client. |input_event_received_time| is local time when |
- // the event was received. |
- int64_t input_event_client_timestamp = -1; |
- base::TimeTicks input_event_received_time; |
+ // The following fields is not null only for one frame after each incoming |
Jamie
2016/10/12 21:41:23
s/fields/field/
s/not null/non-null/
s/only for on
Sergey Ulanov
2016/10/14 19:34:26
Done.
|
+ // input event. |
+ InputEventTimestamps input_event_timestamps; |
base::TimeTicks capture_started_time; |
base::TimeTicks capture_ended_time; |
@@ -159,6 +157,8 @@ class VideoFramePump : public VideoStream, |
// Used to encode captured frames. Always accessed on the encode thread. |
std::unique_ptr<VideoEncoder> encoder_; |
+ scoped_refptr<InputEventTimestampSource> event_timestamp_source_; |
+ |
// Interface through which video frames are passed to the client. |
protocol::VideoStub* video_stub_; |
@@ -174,9 +174,6 @@ class VideoFramePump : public VideoStream, |
// captured. |
CaptureScheduler capture_scheduler_; |
- // Timestamps for the frame to be captured next. |
- std::unique_ptr<FrameTimestamps> next_frame_timestamps_; |
- |
// Timestamps for the frame that's being captured. |
std::unique_ptr<FrameTimestamps> captured_frame_timestamps_; |