Chromium Code Reviews| 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..30c53a5cccea5ab264d3b586e82f025e7d92d39d 100644 |
| --- a/content/renderer/media/video_capture_message_filter_unittest.cc |
| +++ b/content/renderer/media/video_capture_message_filter_unittest.cc |
| @@ -43,7 +43,7 @@ class MockVideoCaptureDelegate : public VideoCaptureMessageFilter::Delegate { |
| MOCK_METHOD1(OnBufferDestroyed, void(int buffer_id)); |
| MOCK_METHOD7(OnBufferReceived, |
| void(int buffer_id, |
| - base::TimeTicks timestamp, |
| + base::TimeDelta timestamp, |
| const base::DictionaryValue& metadata, |
| media::VideoPixelFormat pixel_format, |
| media::VideoFrame::StorageType storage_type, |
| @@ -122,8 +122,15 @@ TEST(VideoCaptureMessageFilterTest, Basic) { |
| VideoCaptureMsg_BufferReady_Params params; |
| params.device_id = delegate.device_id(); |
| params.buffer_id = 22; |
| - params.timestamp = base::TimeTicks::FromInternalValue(1); |
| + params.timestamp = base::TimeDelta::FromMicroseconds(1); |
| params.metadata.SetString("foo", "bar"); |
| + const int64_t internal_value = 1; |
|
miu
2016/06/08 19:24:44
ditto here: Use VideoFrameMetadata here, then Merg
qiangchen
2016/06/08 20:08:55
Done.
|
| + params.metadata.SetWithoutPathExpansion( |
| + base::IntToString( |
| + static_cast<int>(media::VideoFrameMetadata::REFERENCE_TIME)), |
| + base::BinaryValue::CreateWithCopiedBuffer( |
| + reinterpret_cast<const char*>(&internal_value), |
| + sizeof(internal_value))); |
| params.pixel_format = media::PIXEL_FORMAT_I420; |
| params.storage_type = media::VideoFrame::STORAGE_SHMEM; |
| params.coded_size = gfx::Size(234, 512); |