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

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

Issue 2049023002: Revert of New static method I420Buffer::SetToBlack. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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 | « webrtc/media/base/videobroadcaster.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/videobroadcaster_unittest.cc
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc
index d2948bb4372546eb8bbe6fd199fdffd25f0b0bfe..e4e6d3256462b411f2cf4a0391f111ef6b0abda4 100644
--- a/webrtc/media/base/videobroadcaster_unittest.cc
+++ b/webrtc/media/base/videobroadcaster_unittest.cc
@@ -131,16 +131,13 @@
FakeVideoRenderer sink2;
VideoSinkWants wants2;
- wants2.black_frames = false;
+ wants1.black_frames = false;
broadcaster.AddOrUpdateSink(&sink2, wants2);
- rtc::scoped_refptr<webrtc::I420Buffer> buffer(
- new rtc::RefCountedObject<webrtc::I420Buffer>(100, 200));
- // Makes it not all black.
- buffer->InitializeData();
-
- cricket::WebRtcVideoFrame frame1(
- buffer, webrtc::kVideoRotation_0, 10 /* timestamp_us */);
+ cricket::WebRtcVideoFrame frame1;
+ frame1.InitToBlack(100, 200, 10000 /*ts*/);
+ // Make it not all-black
+ frame1.video_frame_buffer()->MutableDataU()[0] = 0;
broadcaster.OnFrame(frame1);
EXPECT_TRUE(sink1.black_frame());
EXPECT_EQ(10000, sink1.timestamp());
@@ -153,8 +150,10 @@
wants2.black_frames = true;
broadcaster.AddOrUpdateSink(&sink2, wants2);
- cricket::WebRtcVideoFrame frame2(
- buffer, webrtc::kVideoRotation_0, 30 /* timestamp_us */);
+ cricket::WebRtcVideoFrame frame2;
+ frame2.InitToBlack(100, 200, 30000 /*ts*/);
+ // Make it not all-black
+ frame2.video_frame_buffer()->MutableDataU()[0] = 0;
broadcaster.OnFrame(frame2);
EXPECT_FALSE(sink1.black_frame());
EXPECT_EQ(30000, sink1.timestamp());
« no previous file with comments | « webrtc/media/base/videobroadcaster.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698