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

Unified Diff: content/renderer/media/video_capture_message_filter_unittest.cc

Issue 2045813003: Decouple capture timestamp and reference time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/renderer/media/video_capture_message_filter_unittest.cc
diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc
index 6a339404de1992ffffe46d20675b58439768e9fc..5b466127ca1f16f79b963cc6e2406c4d1e78f3e8 100644
--- a/content/renderer/media/video_capture_message_filter_unittest.cc
+++ b/content/renderer/media/video_capture_message_filter_unittest.cc
@@ -41,9 +41,10 @@ class MockVideoCaptureDelegate : public VideoCaptureMessageFilter::Delegate {
const gfx::Size& size,
int buffer_id));
MOCK_METHOD1(OnBufferDestroyed, void(int buffer_id));
- MOCK_METHOD7(OnBufferReceived,
+ MOCK_METHOD8(OnBufferReceived,
void(int buffer_id,
- base::TimeTicks timestamp,
+ base::TimeTicks reference_time,
+ base::TimeDelta timestamp,
const base::DictionaryValue& metadata,
media::VideoPixelFormat pixel_format,
media::VideoFrame::StorageType storage_type,
@@ -122,7 +123,8 @@ TEST(VideoCaptureMessageFilterTest, Basic) {
VideoCaptureMsg_BufferReady_Params params;
params.device_id = delegate.device_id();
params.buffer_id = 22;
- params.timestamp = base::TimeTicks::FromInternalValue(1);
+ params.reference_time = base::TimeTicks::FromInternalValue(1);
+ params.timestamp = base::TimeDelta::FromMicroseconds(1);
params.metadata.SetString("foo", "bar");
params.pixel_format = media::PIXEL_FORMAT_I420;
params.storage_type = media::VideoFrame::STORAGE_SHMEM;
@@ -130,11 +132,11 @@ TEST(VideoCaptureMessageFilterTest, Basic) {
params.visible_rect = gfx::Rect(100, 200, 300, 400);
EXPECT_CALL(delegate,
- OnBufferReceived(params.buffer_id, params.timestamp, _,
- media::PIXEL_FORMAT_I420,
+ OnBufferReceived(params.buffer_id, params.reference_time,
+ params.timestamp, _, media::PIXEL_FORMAT_I420,
media::VideoFrame::STORAGE_SHMEM,
params.coded_size, params.visible_rect))
- .WillRepeatedly(WithArg<2>(Invoke(&ExpectMetadataContainsFooBarBaz)));
+ .WillRepeatedly(WithArg<3>(Invoke(&ExpectMetadataContainsFooBarBaz)));
filter->OnMessageReceived(VideoCaptureMsg_BufferReady(params));
Mock::VerifyAndClearExpectations(&delegate);

Powered by Google App Engine
This is Rietveld 408576698