From ee74aa5e23bddc14fa5c8b00036acf897f2b3861 Mon Sep 17 00:00:00 2001 From: "sheu@chromium.org" Date: Wed, 8 Jan 2014 06:15:43 +0000 Subject: Convert video capture pipline to base::TimeTicks base::TimeTicks is a monotonic clock, unlike base::Time, which may change if the system time is changed. Switch over the video capture pipeline to use this clock. BUG=249215 TEST=local build, run on CrOS snow, desktop Linux Review URL: https://codereview.chromium.org/101843005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243493 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/media/video_capture_host.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'content/browser/renderer_host/media/video_capture_host.cc') diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc index 039d981..292ecb7 100644 --- a/content/browser/renderer_host/media/video_capture_host.cc +++ b/content/browser/renderer_host/media/video_capture_host.cc @@ -69,7 +69,7 @@ void VideoCaptureHost::OnBufferDestroyed( void VideoCaptureHost::OnBufferReady( const VideoCaptureControllerID& controller_id, int buffer_id, - base::Time timestamp, + base::TimeTicks timestamp, const media::VideoCaptureFormat& frame_format) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, @@ -112,7 +112,8 @@ void VideoCaptureHost::DoSendFreeBufferOnIOThread( void VideoCaptureHost::DoSendFilledBufferOnIOThread( const VideoCaptureControllerID& controller_id, - int buffer_id, base::Time timestamp, + int buffer_id, + base::TimeTicks timestamp, const media::VideoCaptureFormat& format) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); -- cgit v1.1