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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/web_contents_video_capture_device_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/web_contents_video_capture_device.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6abb1830dbadfa80efe11fd0190d2a1efc1bb476..39b427ba9d1f5534607acdbcf886f3bf44b34de8 100644

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

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

@@ -192,7 +192,7 @@ class CaptureTestView : public TestRenderWidgetHostView {

// Simulate a compositor paint event for our subscriber.

void SimulateUpdate() {

- const base::Time present_time = base::Time::Now();

+ const base::TimeTicks present_time = base::TimeTicks::Now();

RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback callback;

scoped_refptr<media::VideoFrame> target;

if (subscriber_ && subscriber_->ShouldCaptureFrame(present_time,

@@ -335,7 +335,7 @@ class StubClient : public media::VideoCaptureDevice::Client {

virtual void OnIncomingCapturedFrame(

const uint8* data,

int length,

- base::Time timestamp,

+ base::TimeTicks timestamp,

int rotation,

const media::VideoCaptureFormat& frame_format) OVERRIDE {

FAIL();

@@ -344,7 +344,7 @@ class StubClient : public media::VideoCaptureDevice::Client {

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 {

EXPECT_EQ(gfx::Size(kTestWidth, kTestHeight), dimensions);

EXPECT_EQ(media::VideoFrame::I420, format);