Index: webrtc/video/video_quality_test.cc |
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc |
index d440858155a9b4ebdc4b829454e1f5ec53392e54..c4cc7176bb2f5486402d6dcde63face135dc5f13 100644 |
--- a/webrtc/video/video_quality_test.cc |
+++ b/webrtc/video/video_quality_test.cc |
@@ -677,22 +677,22 @@ void VideoQualityTest::SetupScreenshare(const Params& params) { |
void VideoQualityTest::CreateCapturer(const Params& params, |
VideoCaptureInput* input) { |
if (params.screenshare.enabled) { |
- frame_generator_capturer_.reset(new test::FrameGeneratorCapturer( |
- clock_, input, frame_generator_.release(), params.common.fps)); |
- EXPECT_TRUE(frame_generator_capturer_->Init()); |
+ test::FrameGeneratorCapturer *frame_generator_capturer = |
+ new test::FrameGeneratorCapturer( |
+ clock_, input, frame_generator_.release(), params.common.fps); |
+ EXPECT_TRUE(frame_generator_capturer->Init()); |
+ capturer_.reset(frame_generator_capturer); |
} else { |
if (params.video.clip_name.empty()) { |
- frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( |
+ capturer_.reset(test::VideoCapturer::Create( |
input, params.common.width, params.common.height, params.common.fps, |
clock_)); |
- EXPECT_TRUE(frame_generator_capturer_->Init()); |
} else { |
- frame_generator_capturer_.reset( |
- test::FrameGeneratorCapturer::CreateFromYuvFile( |
- input, test::ResourcePath(params.video.clip_name, "yuv"), |
- params.common.width, params.common.height, params.common.fps, |
- clock_)); |
- ASSERT_TRUE(frame_generator_capturer_.get() != nullptr) |
+ capturer_.reset(test::FrameGeneratorCapturer::CreateFromYuvFile( |
+ input, test::ResourcePath(params.video.clip_name, "yuv"), |
+ params.common.width, params.common.height, params.common.fps, |
+ clock_)); |
+ ASSERT_TRUE(capturer_.get() != nullptr) |
<< "Could not create capturer for " << params.video.clip_name |
<< ".yuv. Is this resource file present?"; |
} |
@@ -745,14 +745,20 @@ void VideoQualityTest::RunWithAnalyzer(const Params& params) { |
analyzer.input_ = send_stream_->Input(); |
analyzer.send_stream_ = send_stream_; |
- Start(); |
+ send_stream_->Start(); |
+ for (size_t i = 0; i < receive_streams_.size(); ++i) |
+ receive_streams_[i]->Start(); |
+ capturer_->Start(); |
analyzer.Wait(); |
send_transport.StopSending(); |
recv_transport.StopSending(); |
- Stop(); |
+ capturer_->Stop(); |
+ for (size_t i = 0; i < receive_streams_.size(); ++i) |
+ receive_streams_[i]->Stop(); |
+ send_stream_->Stop(); |
DestroyStreams(); |
@@ -799,11 +805,11 @@ void VideoQualityTest::RunWithVideoRenderer(const Params& params) { |
receive_stream->Start(); |
send_stream_->Start(); |
- frame_generator_capturer_->Start(); |
+ capturer_->Start(); |
test::PressEnterToContinue(); |
- frame_generator_capturer_->Stop(); |
+ capturer_->Stop(); |
send_stream_->Stop(); |
receive_stream->Stop(); |