MockMediaStreamVideoSink: Provide per-frame timestamps in mocks.

This change updates the OnVideoFrame and OnEncodedVideoFrame
mock methods to provide the received timestamp.

Bug: 1048140
Change-Id: I89c4090050b59b03c57d9062d949bc34cc3351ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2034522
Commit-Queue: Markus Handell <handellm@google.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737749}

third_party/blink/renderer/modules/mediastream/media_stream_video_source_test.cc

@@ -160,7 +160,7 @@ class MediaStreamVideoSourceTest : public testing::Test {
                                            MockMediaStreamVideoSink* sink) {
     base::RunLoop run_loop;
     base::OnceClosure quit_closure = run_loop.QuitClosure();
-    EXPECT_CALL(*sink, OnVideoFrame()).WillOnce([&]() {
+    EXPECT_CALL(*sink, OnVideoFrame).WillOnce([&](base::TimeTicks) {
       std::move(quit_closure).Run();
     });
     scoped_refptr<media::VideoFrame> frame =
@@ -183,8 +183,8 @@ class MediaStreamVideoSourceTest : public testing::Test {
       MockMediaStreamVideoSink* sink2) {
     base::RunLoop run_loop;
     base::OnceClosure quit_closure = run_loop.QuitClosure();
-    EXPECT_CALL(*sink1, OnVideoFrame());
-    EXPECT_CALL(*sink2, OnVideoFrame()).WillOnce([&]() {
+    EXPECT_CALL(*sink1, OnVideoFrame);
+    EXPECT_CALL(*sink2, OnVideoFrame).WillOnce([&](base::TimeTicks) {
       std::move(quit_closure).Run();
     });
     scoped_refptr<media::VideoFrame> frame =

third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc

@@ -61,7 +61,7 @@ class MediaStreamVideoTrackTest
       MockMediaStreamVideoSink* sink) {
     base::RunLoop run_loop;
     base::RepeatingClosure quit_closure = run_loop.QuitClosure();
-    EXPECT_CALL(*sink, OnVideoFrame())
+    EXPECT_CALL(*sink, OnVideoFrame)
         .WillOnce(RunClosure(std::move(quit_closure)));
     mock_source()->DeliverVideoFrame(std::move(frame));
     run_loop.Run();
@@ -71,9 +71,9 @@ class MediaStreamVideoTrackTest
                                        MockMediaStreamVideoSink* sink) {
     base::RunLoop run_loop;
     base::RepeatingClosure quit_closure = run_loop.QuitClosure();
-    EXPECT_CALL(*sink, OnEncodedVideoFrame).WillOnce(Invoke([&] {
-      std::move(quit_closure).Run();
-    }));
+    EXPECT_CALL(*sink, OnEncodedVideoFrame)
+        .WillOnce(
+            Invoke([&](base::TimeTicks) { std::move(quit_closure).Run(); }));
     mock_source()->DeliverEncodedVideoFrame(frame);
     run_loop.Run();
   }
@@ -324,8 +324,7 @@ TEST_F(MediaStreamVideoTrackTest, CheckTrackRequestsFrame) {
   MockMediaStreamVideoSink sink;
   base::RunLoop run_loop;
   base::RepeatingClosure quit_closure = run_loop.QuitClosure();
-  EXPECT_CALL(sink, OnVideoFrame())
-      .WillOnce(RunClosure(std::move(quit_closure)));
+  EXPECT_CALL(sink, OnVideoFrame).WillOnce(RunClosure(std::move(quit_closure)));
   sink.ConnectToTrack(track);
   run_loop.Run();
   EXPECT_EQ(1, sink.number_of_frames());
@@ -471,7 +470,7 @@ TEST_F(MediaStreamVideoTrackEncodedTest, TransferOneEncodedVideoFrame) {
   sink.ConnectEncodedToTrack(track);
   base::RunLoop run_loop;
   base::RepeatingClosure quit_closure = run_loop.QuitClosure();
-  EXPECT_CALL(sink, OnEncodedVideoFrame).WillOnce(Invoke([&] {
+  EXPECT_CALL(sink, OnEncodedVideoFrame).WillOnce(Invoke([&](base::TimeTicks) {
     std::move(quit_closure).Run();
   }));
   mock_source()->DeliverEncodedVideoFrame(

third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.cc

@@ -37,13 +37,13 @@ void MockMediaStreamVideoSink::DeliverVideoFrame(
   format_ = frame->format();
   frame_size_ = frame->natural_size();
   last_frame_ = std::move(frame);
-  OnVideoFrame();
+  OnVideoFrame(estimated_capture_time);
 }
 
 void MockMediaStreamVideoSink::DeliverEncodedVideoFrame(
     scoped_refptr<EncodedVideoFrame> frame,
     base::TimeTicks estimated_capture_time) {
-  OnEncodedVideoFrame();
+  OnEncodedVideoFrame(estimated_capture_time);
 }
 
 void MockMediaStreamVideoSink::OnReadyStateChanged(

third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.h

@@ -43,8 +43,8 @@ class MockMediaStreamVideoSink : public MediaStreamVideoSink {
 
   // Triggered when OnVideoFrame(scoped_refptr<media::VideoFrame> frame)
   // is called.
-  MOCK_METHOD0(OnVideoFrame, void());
-  MOCK_METHOD0(OnEncodedVideoFrame, void());
+  MOCK_METHOD1(OnVideoFrame, void(base::TimeTicks));
+  MOCK_METHOD1(OnEncodedVideoFrame, void(base::TimeTicks));
 
   VideoCaptureDeliverFrameCB GetDeliverFrameCB();
   EncodedVideoFrameCB GetDeliverEncodedVideoFrameCB();

third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source_test.cc

@@ -186,8 +186,7 @@ TEST_F(MediaStreamRemoteVideoSourceTest, StartTrack) {
   track->AddSink(&sink, sink.GetDeliverFrameCB(), false);
   base::RunLoop run_loop;
   base::RepeatingClosure quit_closure = run_loop.QuitClosure();
-  EXPECT_CALL(sink, OnVideoFrame())
-      .WillOnce(RunClosure(std::move(quit_closure)));
+  EXPECT_CALL(sink, OnVideoFrame).WillOnce(RunClosure(std::move(quit_closure)));
   rtc::scoped_refptr<webrtc::I420Buffer> buffer(
       new rtc::RefCountedObject<webrtc::I420Buffer>(320, 240));
 
@@ -252,8 +251,7 @@ TEST_F(MediaStreamRemoteVideoSourceTest, PreservesColorSpace) {
   track->AddSink(&sink, sink.GetDeliverFrameCB(), false);
 
   base::RunLoop run_loop;
-  EXPECT_CALL(sink, OnVideoFrame())
-      .WillOnce(RunClosure(run_loop.QuitClosure()));
+  EXPECT_CALL(sink, OnVideoFrame).WillOnce(RunClosure(run_loop.QuitClosure()));
   rtc::scoped_refptr<webrtc::I420Buffer> buffer(
       new rtc::RefCountedObject<webrtc::I420Buffer>(320, 240));
   webrtc::ColorSpace kColorSpace(webrtc::ColorSpace::PrimaryID::kSMPTE240M,
@@ -301,8 +299,7 @@ TEST_F(MediaStreamRemoteVideoSourceTest,
   track->AddSink(&sink, sink.GetDeliverFrameCB(), false);
 
   base::RunLoop run_loop;
-  EXPECT_CALL(sink, OnVideoFrame())
-      .WillOnce(RunClosure(run_loop.QuitClosure()));
+  EXPECT_CALL(sink, OnVideoFrame).WillOnce(RunClosure(run_loop.QuitClosure()));
   rtc::scoped_refptr<webrtc::I420Buffer> buffer(
       new rtc::RefCountedObject<webrtc::I420Buffer>(320, 240));
 
@@ -367,8 +364,7 @@ TEST_F(MediaStreamRemoteVideoSourceTest, MAYBE_ReferenceTimeEqualsTimestampUs) {
   track->AddSink(&sink, sink.GetDeliverFrameCB(), false);
 
   base::RunLoop run_loop;
-  EXPECT_CALL(sink, OnVideoFrame())
-      .WillOnce(RunClosure(run_loop.QuitClosure()));
+  EXPECT_CALL(sink, OnVideoFrame).WillOnce(RunClosure(run_loop.QuitClosure()));
   rtc::scoped_refptr<webrtc::I420Buffer> buffer(
       new rtc::RefCountedObject<webrtc::I420Buffer>(320, 240));
 
@@ -403,8 +399,7 @@ TEST_F(MediaStreamRemoteVideoSourceTest, NoTimestampUsMeansNoReferenceTime) {
   track->AddSink(&sink, sink.GetDeliverFrameCB(), false);
 
   base::RunLoop run_loop;
-  EXPECT_CALL(sink, OnVideoFrame())
-      .WillOnce(RunClosure(run_loop.QuitClosure()));
+  EXPECT_CALL(sink, OnVideoFrame).WillOnce(RunClosure(run_loop.QuitClosure()));
   rtc::scoped_refptr<webrtc::I420Buffer> buffer(
       new rtc::RefCountedObject<webrtc::I420Buffer>(320, 240));
 
@@ -452,7 +447,7 @@ TEST_F(MediaStreamRemoteVideoSourceTest, ForwardsEncodedVideoFrames) {
   track->AddEncodedSink(&sink, sink.GetDeliverEncodedVideoFrameCB());
   base::RunLoop run_loop;
   base::RepeatingClosure quit_closure = run_loop.QuitClosure();
-  EXPECT_CALL(sink, OnEncodedVideoFrame())
+  EXPECT_CALL(sink, OnEncodedVideoFrame)
       .WillOnce(RunClosure(std::move(quit_closure)));
   source()->EncodedSinkInterfaceForTesting()->OnFrame(TestEncodedVideoFrame());
   run_loop.Run();