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

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

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Deleted a newline. Created 4 years, 2 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: webrtc/media/base/videobroadcaster_unittest.cc
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc
index 593c8e5151284ec91df4b252d7ba451877ffb8e1..e7268eb4fdf482f506b45b8a1abe89d9e92710a7 100644
--- a/webrtc/media/base/videobroadcaster_unittest.cc
+++ b/webrtc/media/base/videobroadcaster_unittest.cc
@@ -11,12 +11,11 @@
#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakevideorenderer.h"
#include "webrtc/media/base/videobroadcaster.h"
-#include "webrtc/media/engine/webrtcvideoframe.h"
+#include "webrtc/video_frame.h"
using rtc::VideoBroadcaster;
using rtc::VideoSinkWants;
using cricket::FakeVideoRenderer;
-using cricket::WebRtcVideoFrame;
TEST(VideoBroadcasterTest, frame_wanted) {
@@ -39,7 +38,7 @@ TEST(VideoBroadcasterTest, OnFrame) {
broadcaster.AddOrUpdateSink(&sink1, rtc::VideoSinkWants());
broadcaster.AddOrUpdateSink(&sink2, rtc::VideoSinkWants());
- WebRtcVideoFrame frame;
+ webrtc::VideoFrame frame;
broadcaster.OnFrame(frame);
EXPECT_EQ(1, sink1.num_rendered_frames());
@@ -139,7 +138,7 @@ TEST(VideoBroadcasterTest, SinkWantsBlackFrames) {
// Makes it not all black.
buffer->InitializeData();
- cricket::WebRtcVideoFrame frame1(buffer, webrtc::kVideoRotation_0,
+ webrtc::VideoFrame frame1(buffer, webrtc::kVideoRotation_0,
10 /* timestamp_us */);
broadcaster.OnFrame(frame1);
EXPECT_TRUE(sink1.black_frame());
@@ -153,7 +152,7 @@ TEST(VideoBroadcasterTest, SinkWantsBlackFrames) {
wants2.black_frames = true;
broadcaster.AddOrUpdateSink(&sink2, wants2);
- cricket::WebRtcVideoFrame frame2(buffer, webrtc::kVideoRotation_0,
+ webrtc::VideoFrame frame2(buffer, webrtc::kVideoRotation_0,
30 /* timestamp_us */);
broadcaster.OnFrame(frame2);
EXPECT_FALSE(sink1.black_frame());

Powered by Google App Engine
This is Rietveld 408576698