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

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

Issue 242013002: Refactor video capturing code in the render process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove TimeTicks Created 6 years, 8 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/media_stream_video_source_unittest.cc
diff --git a/content/renderer/media/media_stream_video_source_unittest.cc b/content/renderer/media/media_stream_video_source_unittest.cc
index c6e4bf8418b19e5fe7f9e1314fd1d2e6c7529f06..11a4d6649549b2e60a311ec20e38ce4982bf4272 100644
--- a/content/renderer/media/media_stream_video_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_source_unittest.cc
@@ -106,7 +106,8 @@ class MediaStreamVideoSourceTest
scoped_refptr<media::VideoFrame> frame =
media::VideoFrame::CreateBlackFrame(gfx::Size(capture_width,
capture_height));
- mock_source()->DeliverVideoFrame(frame);
+ mock_source()->DeliverVideoFrame(frame, media::VideoCaptureFormat(),
+ base::TimeTicks::Now());
EXPECT_EQ(1, sink.number_of_frames());
// Expect the delivered frame to be cropped.
@@ -418,7 +419,9 @@ TEST_F(MediaStreamVideoSourceTest, SourceChangeFrameSize) {
{
scoped_refptr<media::VideoFrame> frame1 =
media::VideoFrame::CreateBlackFrame(gfx::Size(320, 240));
- mock_source()->DeliverVideoFrame(frame1);
+ mock_source()->DeliverVideoFrame(frame1,
+ media::VideoCaptureFormat(),
+ base::TimeTicks::Now());
}
EXPECT_EQ(1, sink.number_of_frames());
// Expect the delivered frame to be passed unchanged since its smaller than
@@ -429,7 +432,9 @@ TEST_F(MediaStreamVideoSourceTest, SourceChangeFrameSize) {
{
scoped_refptr<media::VideoFrame> frame2 =
media::VideoFrame::CreateBlackFrame(gfx::Size(640, 480));
- mock_source()->DeliverVideoFrame(frame2);
+ mock_source()->DeliverVideoFrame(frame2,
+ media::VideoCaptureFormat(),
+ base::TimeTicks::Now());
}
EXPECT_EQ(2, sink.number_of_frames());
// Expect the delivered frame to be passed unchanged since its smaller than
@@ -440,7 +445,9 @@ TEST_F(MediaStreamVideoSourceTest, SourceChangeFrameSize) {
{
scoped_refptr<media::VideoFrame> frame3 =
media::VideoFrame::CreateBlackFrame(gfx::Size(1280, 720));
- mock_source()->DeliverVideoFrame(frame3);
+ mock_source()->DeliverVideoFrame(frame3,
+ media::VideoCaptureFormat(),
+ base::TimeTicks::Now());
}
EXPECT_EQ(3, sink.number_of_frames());
// Expect a frame to be cropped since its larger than max requested.

Powered by Google App Engine
This is Rietveld 408576698