Index: content/renderer/media/video_capture_impl.h |
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h |
index 2215cef4336456920329f98ab0c500decbee8f12..73f9f9712b749868be476fab48fddb6a2c3ee408 100644 |
--- a/content/renderer/media/video_capture_impl.h |
+++ b/content/renderer/media/video_capture_impl.h |
@@ -62,10 +62,10 @@ class CONTENT_EXPORT VideoCaptureImpl |
int length, |
int buffer_id) OVERRIDE; |
virtual void OnBufferDestroyed(int buffer_id) OVERRIDE; |
- virtual void OnBufferReceived( |
- int buffer_id, |
- base::Time timestamp, |
- const media::VideoCaptureFormat& format) OVERRIDE; |
+ virtual void OnBufferReceived(int buffer_id, |
+ base::TimeTicks timestamp, |
+ const media::VideoCaptureFormat& format) |
+ OVERRIDE; |
virtual void OnStateChanged(VideoCaptureState state) OVERRIDE; |
virtual void OnDelegateAdded(int32 device_id) OVERRIDE; |
@@ -94,10 +94,9 @@ class CONTENT_EXPORT VideoCaptureImpl |
int length, |
int buffer_id); |
void DoBufferDestroyedOnCaptureThread(int buffer_id); |
- void DoBufferReceivedOnCaptureThread( |
- int buffer_id, |
- base::Time timestamp, |
- const media::VideoCaptureFormat& format); |
+ void DoBufferReceivedOnCaptureThread(int buffer_id, |
+ base::TimeTicks timestamp, |
+ const media::VideoCaptureFormat& format); |
void DoClientBufferFinishedOnCaptureThread( |
int buffer_id, |
const scoped_refptr<ClientBuffer>& buffer); |
@@ -141,6 +140,9 @@ class CONTENT_EXPORT VideoCaptureImpl |
// The device's video capture format sent from browser process side. |
media::VideoCaptureFormat last_frame_format_; |
+ // The device's last captured frame timestamp sent from browser process side. |
+ base::TimeTicks last_frame_timestamp_; |
miu
2014/01/06 22:39:37
This comment and member name are wrong. This look
sheu
2014/01/06 22:52:37
Heh yeah. I was not really paying enough attentio
|
+ |
bool suspended_; |
VideoCaptureState state_; |