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

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

Issue 2304363002: Let ViEEncoder express resolution requests as Sinkwants (Closed)
Patch Set: Fix broken test RunOnTqNormalUsage. 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 video_receive_configs_[0].renderer = &renderer; 226 video_receive_configs_[0].renderer = &renderer;
227 227
228 CreateVideoStreams(); 228 CreateVideoStreams();
229 Start(); 229 Start();
230 230
231 // Create frames that are smaller than the send width/height, this is done to 231 // Create frames that are smaller than the send width/height, this is done to
232 // check that the callbacks are done after processing video. 232 // check that the callbacks are done after processing video.
233 std::unique_ptr<test::FrameGenerator> frame_generator( 233 std::unique_ptr<test::FrameGenerator> frame_generator(
234 test::FrameGenerator::CreateChromaGenerator(kWidth, kHeight)); 234 test::FrameGenerator::CreateChromaGenerator(kWidth, kHeight));
235 test::FrameForwarder frame_forwarder; 235 test::FrameForwarder frame_forwarder;
236 video_send_stream_->SetSource(&frame_forwarder); 236 video_send_stream_->SetSource(&frame_forwarder, false);
237 237
238 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 238 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
239 EXPECT_TRUE(pre_render_callback.Wait()) 239 EXPECT_TRUE(pre_render_callback.Wait())
240 << "Timed out while waiting for pre-render callback."; 240 << "Timed out while waiting for pre-render callback.";
241 EXPECT_TRUE(renderer.Wait()) 241 EXPECT_TRUE(renderer.Wait())
242 << "Timed out while waiting for the frame to render."; 242 << "Timed out while waiting for the frame to render.";
243 243
244 Stop(); 244 Stop();
245 245
246 sender_transport.StopSending(); 246 sender_transport.StopSending();
(...skipping 25 matching lines...) Expand all
272 CreateMatchingReceiveConfigs(&receiver_transport); 272 CreateMatchingReceiveConfigs(&receiver_transport);
273 video_receive_configs_[0].renderer = &renderer; 273 video_receive_configs_[0].renderer = &renderer;
274 274
275 CreateVideoStreams(); 275 CreateVideoStreams();
276 Start(); 276 Start();
277 277
278 std::unique_ptr<test::FrameGenerator> frame_generator( 278 std::unique_ptr<test::FrameGenerator> frame_generator(
279 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth, 279 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth,
280 kDefaultHeight)); 280 kDefaultHeight));
281 test::FrameForwarder frame_forwarder; 281 test::FrameForwarder frame_forwarder;
282 video_send_stream_->SetSource(&frame_forwarder); 282 video_send_stream_->SetSource(&frame_forwarder, false);
283 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 283 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
284 284
285 EXPECT_TRUE(renderer.Wait()) 285 EXPECT_TRUE(renderer.Wait())
286 << "Timed out while waiting for the frame to render."; 286 << "Timed out while waiting for the frame to render.";
287 287
288 Stop(); 288 Stop();
289 289
290 sender_transport.StopSending(); 290 sender_transport.StopSending();
291 receiver_transport.StopSending(); 291 receiver_transport.StopSending();
292 292
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
1310 receive_config.decoders.push_back(decoder); 1310 receive_config.decoders.push_back(decoder);
1311 1311
1312 UpdateReceiveConfig(i, &receive_config); 1312 UpdateReceiveConfig(i, &receive_config);
1313 1313
1314 receive_streams[i] = 1314 receive_streams[i] =
1315 receiver_call->CreateVideoReceiveStream(std::move(receive_config)); 1315 receiver_call->CreateVideoReceiveStream(std::move(receive_config));
1316 receive_streams[i]->Start(); 1316 receive_streams[i]->Start();
1317 1317
1318 frame_generators[i] = test::FrameGeneratorCapturer::Create( 1318 frame_generators[i] = test::FrameGeneratorCapturer::Create(
1319 width, height, 30, Clock::GetRealTimeClock()); 1319 width, height, 30, Clock::GetRealTimeClock());
1320 send_streams[i]->SetSource(frame_generators[i]); 1320 send_streams[i]->SetSource(frame_generators[i], false);
1321 frame_generators[i]->Start(); 1321 frame_generators[i]->Start();
1322 } 1322 }
1323 1323
1324 Wait(); 1324 Wait();
1325 1325
1326 for (size_t i = 0; i < kNumStreams; ++i) { 1326 for (size_t i = 0; i < kNumStreams; ++i) {
1327 frame_generators[i]->Stop(); 1327 frame_generators[i]->Stop();
1328 sender_call->DestroyVideoSendStream(send_streams[i]); 1328 sender_call->DestroyVideoSendStream(send_streams[i]);
1329 receiver_call->DestroyVideoReceiveStream(receive_streams[i]); 1329 receiver_call->DestroyVideoReceiveStream(receive_streams[i]);
1330 delete frame_generators[i]; 1330 delete frame_generators[i];
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 video_send_config_.post_encode_callback = &post_encode_observer; 1770 video_send_config_.post_encode_callback = &post_encode_observer;
1771 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer; 1771 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer;
1772 1772
1773 CreateVideoStreams(); 1773 CreateVideoStreams();
1774 Start(); 1774 Start();
1775 1775
1776 std::unique_ptr<test::FrameGenerator> frame_generator( 1776 std::unique_ptr<test::FrameGenerator> frame_generator(
1777 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth, 1777 test::FrameGenerator::CreateChromaGenerator(kDefaultWidth,
1778 kDefaultHeight)); 1778 kDefaultHeight));
1779 test::FrameForwarder forwarder; 1779 test::FrameForwarder forwarder;
1780 video_send_stream_->SetSource(&forwarder); 1780 video_send_stream_->SetSource(&forwarder, false);
1781 forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 1781 forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
1782 1782
1783 EXPECT_TRUE(post_encode_observer.Wait()) 1783 EXPECT_TRUE(post_encode_observer.Wait())
1784 << "Timed out while waiting for send-side encoded-frame callback."; 1784 << "Timed out while waiting for send-side encoded-frame callback.";
1785 1785
1786 EXPECT_TRUE(pre_decode_observer.Wait()) 1786 EXPECT_TRUE(pre_decode_observer.Wait())
1787 << "Timed out while waiting for pre-decode encoded-frame callback."; 1787 << "Timed out while waiting for pre-decode encoded-frame callback.";
1788 1788
1789 post_encode_observer.ExpectEqualFrames(pre_decode_observer); 1789 post_encode_observer.ExpectEqualFrames(pre_decode_observer);
1790 1790
(...skipping 2152 matching lines...) Expand 10 before | Expand all | Expand 10 after
3943 std::unique_ptr<VideoEncoder> encoder_; 3943 std::unique_ptr<VideoEncoder> encoder_;
3944 std::unique_ptr<VideoDecoder> decoder_; 3944 std::unique_ptr<VideoDecoder> decoder_;
3945 rtc::CriticalSection crit_; 3945 rtc::CriticalSection crit_;
3946 int recorded_frames_ GUARDED_BY(crit_); 3946 int recorded_frames_ GUARDED_BY(crit_);
3947 } test(this); 3947 } test(this);
3948 3948
3949 RunBaseTest(&test); 3949 RunBaseTest(&test);
3950 } 3950 }
3951 3951
3952 } // namespace webrtc 3952 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698