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

Side by Side Diff: webrtc/media/base/videobroadcaster_unittest.cc

Issue 2315663002: Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)
Patch Set: Add missing include of logging.h. 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 unified diff | Download patch
« no previous file with comments | « webrtc/media/base/videobroadcaster.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 VideoSinkWants wants2; 133 VideoSinkWants wants2;
134 wants2.black_frames = false; 134 wants2.black_frames = false;
135 broadcaster.AddOrUpdateSink(&sink2, wants2); 135 broadcaster.AddOrUpdateSink(&sink2, wants2);
136 136
137 rtc::scoped_refptr<webrtc::I420Buffer> buffer( 137 rtc::scoped_refptr<webrtc::I420Buffer> buffer(
138 new rtc::RefCountedObject<webrtc::I420Buffer>(100, 200)); 138 new rtc::RefCountedObject<webrtc::I420Buffer>(100, 200));
139 // Makes it not all black. 139 // Makes it not all black.
140 buffer->InitializeData(); 140 buffer->InitializeData();
141 141
142 cricket::WebRtcVideoFrame frame1(buffer, webrtc::kVideoRotation_0, 142 cricket::WebRtcVideoFrame frame1(buffer, webrtc::kVideoRotation_0,
143 10 /* timestamp_us */, 0 /* frame_id */); 143 10 /* timestamp_us */);
144 broadcaster.OnFrame(frame1); 144 broadcaster.OnFrame(frame1);
145 EXPECT_TRUE(sink1.black_frame()); 145 EXPECT_TRUE(sink1.black_frame());
146 EXPECT_EQ(10, sink1.timestamp_us()); 146 EXPECT_EQ(10, sink1.timestamp_us());
147 EXPECT_FALSE(sink2.black_frame()); 147 EXPECT_FALSE(sink2.black_frame());
148 EXPECT_EQ(10, sink2.timestamp_us()); 148 EXPECT_EQ(10, sink2.timestamp_us());
149 149
150 // Switch the sink wants. 150 // Switch the sink wants.
151 wants1.black_frames = false; 151 wants1.black_frames = false;
152 broadcaster.AddOrUpdateSink(&sink1, wants1); 152 broadcaster.AddOrUpdateSink(&sink1, wants1);
153 wants2.black_frames = true; 153 wants2.black_frames = true;
154 broadcaster.AddOrUpdateSink(&sink2, wants2); 154 broadcaster.AddOrUpdateSink(&sink2, wants2);
155 155
156 cricket::WebRtcVideoFrame frame2(buffer, webrtc::kVideoRotation_0, 156 cricket::WebRtcVideoFrame frame2(buffer, webrtc::kVideoRotation_0,
157 30 /* timestamp_us */, 0 /* frame_id */); 157 30 /* timestamp_us */);
158 broadcaster.OnFrame(frame2); 158 broadcaster.OnFrame(frame2);
159 EXPECT_FALSE(sink1.black_frame()); 159 EXPECT_FALSE(sink1.black_frame());
160 EXPECT_EQ(30, sink1.timestamp_us()); 160 EXPECT_EQ(30, sink1.timestamp_us());
161 EXPECT_TRUE(sink2.black_frame()); 161 EXPECT_TRUE(sink2.black_frame());
162 EXPECT_EQ(30, sink2.timestamp_us()); 162 EXPECT_EQ(30, sink2.timestamp_us());
163 } 163 }
OLDNEW
« 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