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

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

Issue 2344923002: Revert of Replace interface VideoCapturerInput with VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 3 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/test/video_capturer.cc ('k') | webrtc/video/video_quality_test.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 (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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 video_receive_configs_[0].pre_render_callback = &pre_render_callback; 207 video_receive_configs_[0].pre_render_callback = &pre_render_callback;
208 video_receive_configs_[0].renderer = &renderer; 208 video_receive_configs_[0].renderer = &renderer;
209 209
210 CreateVideoStreams(); 210 CreateVideoStreams();
211 Start(); 211 Start();
212 212
213 // Create frames that are smaller than the send width/height, this is done to 213 // Create frames that are smaller than the send width/height, this is done to
214 // check that the callbacks are done after processing video. 214 // check that the callbacks are done after processing video.
215 std::unique_ptr<test::FrameGenerator> frame_generator( 215 std::unique_ptr<test::FrameGenerator> frame_generator(
216 test::FrameGenerator::CreateChromaGenerator(kWidth, kHeight)); 216 test::FrameGenerator::CreateChromaGenerator(kWidth, kHeight));
217 test::FrameForwarder frame_forwarder; 217 video_send_stream_->Input()->IncomingCapturedFrame(
218 video_send_stream_->SetSource(&frame_forwarder); 218 *frame_generator->NextFrame());
219
220 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
221 EXPECT_TRUE(pre_render_callback.Wait()) 219 EXPECT_TRUE(pre_render_callback.Wait())
222 << "Timed out while waiting for pre-render callback."; 220 << "Timed out while waiting for pre-render callback.";
223 EXPECT_TRUE(renderer.Wait()) 221 EXPECT_TRUE(renderer.Wait())
224 << "Timed out while waiting for the frame to render."; 222 << "Timed out while waiting for the frame to render.";
225 223
226 Stop(); 224 Stop();
227 225
228 sender_transport.StopSending(); 226 sender_transport.StopSending();
229 receiver_transport.StopSending(); 227 receiver_transport.StopSending();
230 228
(...skipping 23 matching lines...) Expand all
254 CreateMatchingReceiveConfigs(&receiver_transport); 252 CreateMatchingReceiveConfigs(&receiver_transport);
255 video_receive_configs_[0].renderer = &renderer; 253 video_receive_configs_[0].renderer = &renderer;
256 254
257 CreateVideoStreams(); 255 CreateVideoStreams();
258 Start(); 256 Start();
259 257
260 std::unique_ptr<test::FrameGenerator> frame_generator( 258 std::unique_ptr<test::FrameGenerator> frame_generator(
261 test::FrameGenerator::CreateChromaGenerator( 259 test::FrameGenerator::CreateChromaGenerator(
262 video_encoder_config_.streams[0].width, 260 video_encoder_config_.streams[0].width,
263 video_encoder_config_.streams[0].height)); 261 video_encoder_config_.streams[0].height));
264 test::FrameForwarder frame_forwarder; 262 video_send_stream_->Input()->IncomingCapturedFrame(
265 video_send_stream_->SetSource(&frame_forwarder); 263 *frame_generator->NextFrame());
266 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
267 264
268 EXPECT_TRUE(renderer.Wait()) 265 EXPECT_TRUE(renderer.Wait())
269 << "Timed out while waiting for the frame to render."; 266 << "Timed out while waiting for the frame to render.";
270 267
271 Stop(); 268 Stop();
272 269
273 sender_transport.StopSending(); 270 sender_transport.StopSending();
274 receiver_transport.StopSending(); 271 receiver_transport.StopSending();
275 272
276 DestroyStreams(); 273 DestroyStreams();
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 std::unique_ptr<VideoDecoder>(decoder.decoder)); 1297 std::unique_ptr<VideoDecoder>(decoder.decoder));
1301 receive_config.decoders.push_back(decoder); 1298 receive_config.decoders.push_back(decoder);
1302 1299
1303 UpdateReceiveConfig(i, &receive_config); 1300 UpdateReceiveConfig(i, &receive_config);
1304 1301
1305 receive_streams[i] = 1302 receive_streams[i] =
1306 receiver_call->CreateVideoReceiveStream(std::move(receive_config)); 1303 receiver_call->CreateVideoReceiveStream(std::move(receive_config));
1307 receive_streams[i]->Start(); 1304 receive_streams[i]->Start();
1308 1305
1309 frame_generators[i] = test::FrameGeneratorCapturer::Create( 1306 frame_generators[i] = test::FrameGeneratorCapturer::Create(
1310 width, height, 30, Clock::GetRealTimeClock()); 1307 send_streams[i]->Input(), width, height, 30,
1311 send_streams[i]->SetSource(frame_generators[i]); 1308 Clock::GetRealTimeClock());
1312 frame_generators[i]->Start(); 1309 frame_generators[i]->Start();
1313 } 1310 }
1314 1311
1315 Wait(); 1312 Wait();
1316 1313
1317 for (size_t i = 0; i < kNumStreams; ++i) { 1314 for (size_t i = 0; i < kNumStreams; ++i) {
1318 frame_generators[i]->Stop(); 1315 frame_generators[i]->Stop();
1319 sender_call->DestroyVideoSendStream(send_streams[i]); 1316 sender_call->DestroyVideoSendStream(send_streams[i]);
1320 receiver_call->DestroyVideoReceiveStream(receive_streams[i]); 1317 receiver_call->DestroyVideoReceiveStream(receive_streams[i]);
1321 delete frame_generators[i]; 1318 delete frame_generators[i];
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 video_send_config_.post_encode_callback = &post_encode_observer; 1758 video_send_config_.post_encode_callback = &post_encode_observer;
1762 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer; 1759 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer;
1763 1760
1764 CreateVideoStreams(); 1761 CreateVideoStreams();
1765 Start(); 1762 Start();
1766 1763
1767 std::unique_ptr<test::FrameGenerator> frame_generator( 1764 std::unique_ptr<test::FrameGenerator> frame_generator(
1768 test::FrameGenerator::CreateChromaGenerator( 1765 test::FrameGenerator::CreateChromaGenerator(
1769 video_encoder_config_.streams[0].width, 1766 video_encoder_config_.streams[0].width,
1770 video_encoder_config_.streams[0].height)); 1767 video_encoder_config_.streams[0].height));
1771 test::FrameForwarder forwarder; 1768 video_send_stream_->Input()->IncomingCapturedFrame(
1772 video_send_stream_->SetSource(&forwarder); 1769 *frame_generator->NextFrame());
1773 forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
1774 1770
1775 EXPECT_TRUE(post_encode_observer.Wait()) 1771 EXPECT_TRUE(post_encode_observer.Wait())
1776 << "Timed out while waiting for send-side encoded-frame callback."; 1772 << "Timed out while waiting for send-side encoded-frame callback.";
1777 1773
1778 EXPECT_TRUE(pre_decode_observer.Wait()) 1774 EXPECT_TRUE(pre_decode_observer.Wait())
1779 << "Timed out while waiting for pre-decode encoded-frame callback."; 1775 << "Timed out while waiting for pre-decode encoded-frame callback.";
1780 1776
1781 post_encode_observer.ExpectEqualFrames(pre_decode_observer); 1777 post_encode_observer.ExpectEqualFrames(pre_decode_observer);
1782 1778
1783 Stop(); 1779 Stop();
(...skipping 1957 matching lines...) Expand 10 before | Expand all | Expand 10 after
3741 private: 3737 private:
3742 bool video_observed_; 3738 bool video_observed_;
3743 bool audio_observed_; 3739 bool audio_observed_;
3744 SequenceNumberUnwrapper unwrapper_; 3740 SequenceNumberUnwrapper unwrapper_;
3745 std::set<int64_t> received_packet_ids_; 3741 std::set<int64_t> received_packet_ids_;
3746 } test; 3742 } test;
3747 3743
3748 RunBaseTest(&test); 3744 RunBaseTest(&test);
3749 } 3745 }
3750 } // namespace webrtc 3746 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/video_capturer.cc ('k') | webrtc/video/video_quality_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698