Chromium Code Reviews

Unified Diff: webrtc/media/base/videobroadcaster_unittest.cc

Issue 2315663002: Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: webrtc/media/base/videobroadcaster_unittest.cc
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc
index 58efbf3545628b5f5d43f9ed853baa130d0594cf..593c8e5151284ec91df4b252d7ba451877ffb8e1 100644
--- a/webrtc/media/base/videobroadcaster_unittest.cc
+++ b/webrtc/media/base/videobroadcaster_unittest.cc
@@ -140,12 +140,12 @@ TEST(VideoBroadcasterTest, SinkWantsBlackFrames) {
buffer->InitializeData();
cricket::WebRtcVideoFrame frame1(buffer, webrtc::kVideoRotation_0,
- 10 /* timestamp_us */, 0 /* frame_id */);
+ 10 /* timestamp_us */);
broadcaster.OnFrame(frame1);
EXPECT_TRUE(sink1.black_frame());
- EXPECT_EQ(10000, sink1.timestamp());
+ EXPECT_EQ(10, sink1.timestamp_us());
EXPECT_FALSE(sink2.black_frame());
- EXPECT_EQ(10000, sink2.timestamp());
+ EXPECT_EQ(10, sink2.timestamp_us());
// Switch the sink wants.
wants1.black_frames = false;
@@ -154,10 +154,10 @@ TEST(VideoBroadcasterTest, SinkWantsBlackFrames) {
broadcaster.AddOrUpdateSink(&sink2, wants2);
cricket::WebRtcVideoFrame frame2(buffer, webrtc::kVideoRotation_0,
- 30 /* timestamp_us */, 0 /* frame_id */);
+ 30 /* timestamp_us */);
broadcaster.OnFrame(frame2);
EXPECT_FALSE(sink1.black_frame());
- EXPECT_EQ(30000, sink1.timestamp());
+ EXPECT_EQ(30, sink1.timestamp_us());
EXPECT_TRUE(sink2.black_frame());
- EXPECT_EQ(30000, sink2.timestamp());
+ EXPECT_EQ(30, sink2.timestamp_us());
}

Powered by Google App Engine