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

Side by Side Diff: webrtc/video/end_to_end_tests.cc

Issue 2304363002: Let ViEEncoder express resolution requests as Sinkwants (Closed)
Patch Set: Rebased and fixed. 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #include <algorithm> 10 #include <algorithm>
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 video_receive_configs_[0].renderer = &renderer; 209 video_receive_configs_[0].renderer = &renderer;
210 210
211 CreateVideoStreams(); 211 CreateVideoStreams();
212 Start(); 212 Start();
213 213
214 // Create frames that are smaller than the send width/height, this is done to 214 // Create frames that are smaller than the send width/height, this is done to
215 // check that the callbacks are done after processing video. 215 // check that the callbacks are done after processing video.
216 std::unique_ptr<test::FrameGenerator> frame_generator( 216 std::unique_ptr<test::FrameGenerator> frame_generator(
217 test::FrameGenerator::CreateChromaGenerator(kWidth, kHeight)); 217 test::FrameGenerator::CreateChromaGenerator(kWidth, kHeight));
218 test::FrameForwarder frame_forwarder; 218 test::FrameForwarder frame_forwarder;
219 video_send_stream_->SetSource(&frame_forwarder); 219 video_send_stream_->SetSource(&frame_forwarder, false);
220 220
221 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 221 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
222 EXPECT_TRUE(pre_render_callback.Wait()) 222 EXPECT_TRUE(pre_render_callback.Wait())
223 << "Timed out while waiting for pre-render callback."; 223 << "Timed out while waiting for pre-render callback.";
224 EXPECT_TRUE(renderer.Wait()) 224 EXPECT_TRUE(renderer.Wait())
225 << "Timed out while waiting for the frame to render."; 225 << "Timed out while waiting for the frame to render.";
226 226
227 Stop(); 227 Stop();
228 228
229 sender_transport.StopSending(); 229 sender_transport.StopSending();
(...skipping 25 matching lines...) Expand all
255 CreateMatchingReceiveConfigs(&receiver_transport); 255 CreateMatchingReceiveConfigs(&receiver_transport);
256 video_receive_configs_[0].renderer = &renderer; 256 video_receive_configs_[0].renderer = &renderer;
257 257
258 CreateVideoStreams(); 258 CreateVideoStreams();
259 Start(); 259 Start();
260 260
261 std::unique_ptr<test::FrameGenerator> frame_generator( 261 std::unique_ptr<test::FrameGenerator> frame_generator(
262 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth, 262 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth,
263 kDefaultHeight)); 263 kDefaultHeight));
264 test::FrameForwarder frame_forwarder; 264 test::FrameForwarder frame_forwarder;
265 video_send_stream_->SetSource(&frame_forwarder); 265 video_send_stream_->SetSource(&frame_forwarder, false);
266 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 266 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
267 267
268 EXPECT_TRUE(renderer.Wait()) 268 EXPECT_TRUE(renderer.Wait())
269 << "Timed out while waiting for the frame to render."; 269 << "Timed out while waiting for the frame to render.";
270 270
271 Stop(); 271 Stop();
272 272
273 sender_transport.StopSending(); 273 sender_transport.StopSending();
274 receiver_transport.StopSending(); 274 receiver_transport.StopSending();
275 275
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 receive_config.decoders.push_back(decoder); 1291 receive_config.decoders.push_back(decoder);
1292 1292
1293 UpdateReceiveConfig(i, &receive_config); 1293 UpdateReceiveConfig(i, &receive_config);
1294 1294
1295 receive_streams[i] = 1295 receive_streams[i] =
1296 receiver_call->CreateVideoReceiveStream(std::move(receive_config)); 1296 receiver_call->CreateVideoReceiveStream(std::move(receive_config));
1297 receive_streams[i]->Start(); 1297 receive_streams[i]->Start();
1298 1298
1299 frame_generators[i] = test::FrameGeneratorCapturer::Create( 1299 frame_generators[i] = test::FrameGeneratorCapturer::Create(
1300 width, height, 30, Clock::GetRealTimeClock()); 1300 width, height, 30, Clock::GetRealTimeClock());
1301 send_streams[i]->SetSource(frame_generators[i]); 1301 send_streams[i]->SetSource(frame_generators[i], false);
1302 frame_generators[i]->Start(); 1302 frame_generators[i]->Start();
1303 } 1303 }
1304 1304
1305 Wait(); 1305 Wait();
1306 1306
1307 for (size_t i = 0; i < kNumStreams; ++i) { 1307 for (size_t i = 0; i < kNumStreams; ++i) {
1308 frame_generators[i]->Stop(); 1308 frame_generators[i]->Stop();
1309 sender_call->DestroyVideoSendStream(send_streams[i]); 1309 sender_call->DestroyVideoSendStream(send_streams[i]);
1310 receiver_call->DestroyVideoReceiveStream(receive_streams[i]); 1310 receiver_call->DestroyVideoReceiveStream(receive_streams[i]);
1311 delete frame_generators[i]; 1311 delete frame_generators[i];
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1751 video_send_config_.post_encode_callback = &post_encode_observer; 1751 video_send_config_.post_encode_callback = &post_encode_observer;
1752 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer; 1752 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer;
1753 1753
1754 CreateVideoStreams(); 1754 CreateVideoStreams();
1755 Start(); 1755 Start();
1756 1756
1757 std::unique_ptr<test::FrameGenerator> frame_generator( 1757 std::unique_ptr<test::FrameGenerator> frame_generator(
1758 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth, 1758 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth,
1759 kDefaultHeight)); 1759 kDefaultHeight));
1760 test::FrameForwarder forwarder; 1760 test::FrameForwarder forwarder;
1761 video_send_stream_->SetSource(&forwarder); 1761 video_send_stream_->SetSource(&forwarder, false);
1762 forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 1762 forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
1763 1763
1764 EXPECT_TRUE(post_encode_observer.Wait()) 1764 EXPECT_TRUE(post_encode_observer.Wait())
1765 << "Timed out while waiting for send-side encoded-frame callback."; 1765 << "Timed out while waiting for send-side encoded-frame callback.";
1766 1766
1767 EXPECT_TRUE(pre_decode_observer.Wait()) 1767 EXPECT_TRUE(pre_decode_observer.Wait())
1768 << "Timed out while waiting for pre-decode encoded-frame callback."; 1768 << "Timed out while waiting for pre-decode encoded-frame callback.";
1769 1769
1770 post_encode_observer.ExpectEqualFrames(pre_decode_observer); 1770 post_encode_observer.ExpectEqualFrames(pre_decode_observer);
1771 1771
(...skipping 2150 matching lines...) Expand 10 before | Expand all | Expand 10 after
3922 std::unique_ptr<VideoEncoder> encoder_; 3922 std::unique_ptr<VideoEncoder> encoder_;
3923 std::unique_ptr<VideoDecoder> decoder_; 3923 std::unique_ptr<VideoDecoder> decoder_;
3924 rtc::CriticalSection crit_; 3924 rtc::CriticalSection crit_;
3925 int recorded_frames_ GUARDED_BY(crit_); 3925 int recorded_frames_ GUARDED_BY(crit_);
3926 } test(this); 3926 } test(this);
3927 3927
3928 RunBaseTest(&test); 3928 RunBaseTest(&test);
3929 } 3929 }
3930 3930
3931 } // namespace webrtc 3931 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698