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

Unified Diff: media/video/capture/fake_video_capture_device_unittest.cc

Issue 955253002: Add metadata to media::VideoFrame and plumb it through IPC/MediaStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tommi's nits addressed Created 5 years, 10 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 | « media/media.gyp ('k') | media/video/capture/video_capture_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/fake_video_capture_device_unittest.cc
diff --git a/media/video/capture/fake_video_capture_device_unittest.cc b/media/video/capture/fake_video_capture_device_unittest.cc
index ace1a28a47c83f494a17d2392b4eddf3df2b9c98..3ad349f4f49bd16f73d7efbe9fd37cef37504012 100644
--- a/media/video/capture/fake_video_capture_device_unittest.cc
+++ b/media/video/capture/fake_video_capture_device_unittest.cc
@@ -26,9 +26,8 @@ class MockClient : public VideoCaptureDevice::Client {
MOCK_METHOD2(ReserveOutputBuffer,
scoped_refptr<Buffer>(VideoFrame::Format format,
const gfx::Size& dimensions));
- MOCK_METHOD4(OnIncomingCapturedVideoFrame,
+ MOCK_METHOD3(OnIncomingCapturedVideoFrame,
void(const scoped_refptr<Buffer>& buffer,
- const VideoCaptureFormat& buffer_format,
const scoped_refptr<media::VideoFrame>& frame,
const base::TimeTicks& timestamp));
MOCK_METHOD1(OnError, void(const std::string& reason));
@@ -82,7 +81,7 @@ class FakeVideoCaptureDeviceTest : public testing::Test {
void SetUp() override {
EXPECT_CALL(*client_, ReserveOutputBuffer(_,_)).Times(0);
- EXPECT_CALL(*client_, OnIncomingCapturedVideoFrame(_,_,_,_)).Times(0);
+ EXPECT_CALL(*client_, OnIncomingCapturedVideoFrame(_,_,_)).Times(0);
}
void OnFrameCaptured(const VideoCaptureFormat& format) {
« no previous file with comments | « media/media.gyp ('k') | media/video/capture/video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698