content/browser/renderer_host/media/video_capture_controller_unittest.cc - Issue 101843005: Convert video capture pipline to base::TimeTicks

Unified Diff: content/browser/renderer_host/media/video_capture_controller_unittest.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

« no previous file with comments | « content/browser/renderer_host/media/video_capture_controller_event_handler.h ('k') | content/browser/renderer_host/media/video_capture_device_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc

diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc

index 20cc4e41a891644a66e1cf45f041961302f52d4f..1852a71fe8a3d61f828453a9cebe97fbff30c621 100644

--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc

+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc

@@ -59,7 +59,7 @@ class MockVideoCaptureControllerEventHandler

}

virtual void OnBufferReady(const VideoCaptureControllerID& id,

int buffer_id,

- base::Time timestamp,

+ base::TimeTicks timestamp,

const media::VideoCaptureFormat& format) OVERRIDE {

DoBufferReady(id);

base::MessageLoop::current()->PostTask(FROM_HERE,

@@ -279,7 +279,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {

device_->OnIncomingCapturedBuffer(buffer,

media::VideoFrame::I420,

capture_resolution,

- base::Time(),

+ base::TimeTicks(),

device_format.frame_rate);

buffer = NULL;

@@ -297,7 +297,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {

device_->OnIncomingCapturedBuffer(buffer,

media::VideoFrame::I420,

capture_resolution,

- base::Time(),

+ base::TimeTicks(),

device_format.frame_rate);

buffer = NULL;

@@ -326,7 +326,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {

device_->OnIncomingCapturedBuffer(buffer,

media::VideoFrame::I420,

capture_resolution,

- base::Time(),

+ base::TimeTicks(),

device_format.frame_rate);

buffer = NULL;

}

@@ -364,7 +364,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {

device_->OnIncomingCapturedBuffer(buffer,

media::VideoFrame::I420,

capture_resolution,

- base::Time(),

+ base::TimeTicks(),

device_format.frame_rate);

buffer = NULL;

buffer =

@@ -380,7 +380,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {

device_->OnIncomingCapturedBuffer(buffer,

media::VideoFrame::I420,

capture_resolution,

- base::Time(),

+ base::TimeTicks(),

device_format.frame_rate);

buffer = NULL;

// B2 is the only client left, and is the only one that should

@@ -424,8 +424,11 @@ TEST_F(VideoCaptureControllerTest, ErrorBeforeDeviceCreation) {

device_->ReserveOutputBuffer(media::VideoFrame::I420, capture_resolution);

ASSERT_TRUE(buffer);

- device_->OnIncomingCapturedBuffer(

- buffer, media::VideoFrame::I420, capture_resolution, base::Time(), 30);

+ device_->OnIncomingCapturedBuffer(buffer,

+ media::VideoFrame::I420,

+ capture_resolution,

+ base::TimeTicks(),

+ 30);

buffer = NULL;

base::RunLoop().RunUntilIdle();

@@ -463,7 +466,7 @@ TEST_F(VideoCaptureControllerTest, ErrorAfterDeviceCreation) {

device_->OnIncomingCapturedBuffer(buffer,

media::VideoFrame::I420,

dims,

- base::Time(),

+ base::TimeTicks(),

device_format.frame_rate);

buffer = NULL;