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

Unified Diff: content/browser/renderer_host/media/video_capture_controller.cc

Issue 101843005: Convert video capture pipline to base::TimeTicks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 9890509b Rebase, Windows compile fixes Created 6 years, 11 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: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index 88fd72ad5ef1cf921bd781f27024934ad33c7e76..f23f50f82b2a771746ce012cbccebb0dc82cce94 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -112,14 +112,14 @@ class VideoCaptureController::VideoCaptureDeviceClient
const gfx::Size& size) OVERRIDE;
virtual void OnIncomingCapturedFrame(const uint8* data,
int length,
- base::Time timestamp,
+ base::TimeTicks timestamp,
int rotation,
const VideoCaptureFormat& frame_format)
OVERRIDE;
virtual void OnIncomingCapturedBuffer(const scoped_refptr<Buffer>& buffer,
media::VideoFrame::Format format,
const gfx::Size& dimensions,
- base::Time timestamp,
+ base::TimeTicks timestamp,
int frame_rate) OVERRIDE;
virtual void OnError() OVERRIDE;
@@ -267,7 +267,7 @@ VideoCaptureController::VideoCaptureDeviceClient::ReserveOutputBuffer(
void VideoCaptureController::VideoCaptureDeviceClient::OnIncomingCapturedFrame(
const uint8* data,
int length,
- base::Time timestamp,
+ base::TimeTicks timestamp,
int rotation,
const VideoCaptureFormat& frame_format) {
TRACE_EVENT0("video", "VideoCaptureController::OnIncomingCapturedFrame");
@@ -410,7 +410,7 @@ void VideoCaptureController::VideoCaptureDeviceClient::OnIncomingCapturedBuffer(
const scoped_refptr<Buffer>& buffer,
media::VideoFrame::Format format,
const gfx::Size& dimensions,
- base::Time timestamp,
+ base::TimeTicks timestamp,
int frame_rate) {
// The capture pipeline expects I420 for now.
DCHECK_EQ(format, media::VideoFrame::I420)
@@ -476,7 +476,7 @@ void VideoCaptureController::DoIncomingCapturedI420BufferOnIOThread(
scoped_refptr<media::VideoCaptureDevice::Client::Buffer> buffer,
const gfx::Size& dimensions,
int frame_rate,
- base::Time timestamp) {
+ base::TimeTicks timestamp) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DCHECK_NE(buffer->id(), VideoCaptureBufferPool::kInvalidId);

Powered by Google App Engine
This is Rietveld 408576698