From cb8f045d9f0b71e2ed53d04fa8ae01278fe299ea Mon Sep 17 00:00:00 2001 From: brandtr Date: Fri, 30 Jun 2017 02:34:20 -0700 Subject: [PATCH] Fix receiving FlexFEC in video_loopback. BUG=webrtc:5654 Review-Url: https://codereview.webrtc.org/2965503006 Cr-Commit-Position: refs/heads/master@{#18847} --- webrtc/video/video_quality_test.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc index 3f0465d361..5e99b50ff0 100644 --- a/webrtc/video/video_quality_test.cc +++ b/webrtc/video/video_quality_test.cc @@ -1879,7 +1879,6 @@ void VideoQualityTest::RunWithRenderers(const Params& params) { send_transport.SetReceiver(receiver_call_->Receiver()); recv_transport.SetReceiver(sender_call_->Receiver()); - FlexfecReceiveStream* flexfec_receive_stream = nullptr; std::unique_ptr local_preview; std::vector> loopback_renderers_; if (params_.video.enabled) { @@ -1944,8 +1943,10 @@ void VideoQualityTest::RunWithRenderers(const Params& params) { // Start sending and receiving video. if (params_.video.enabled) { - if (flexfec_receive_stream) + for (FlexfecReceiveStream* flexfec_receive_stream : + flexfec_receive_streams_) { flexfec_receive_stream->Start(); + } for (VideoReceiveStream* receive_stream : video_receive_streams_) receive_stream->Start(); video_send_stream_->Start(); @@ -1980,14 +1981,15 @@ void VideoQualityTest::RunWithRenderers(const Params& params) { if (params_.video.enabled) { video_capturer_->Stop(); video_send_stream_->Stop(); - for (VideoReceiveStream* receive_stream : video_receive_streams_) - receive_stream->Stop(); - if (flexfec_receive_stream) { + for (FlexfecReceiveStream* flexfec_receive_stream : + flexfec_receive_streams_) { flexfec_receive_stream->Stop(); receiver_call_->DestroyFlexfecReceiveStream(flexfec_receive_stream); } - for (VideoReceiveStream* receive_stream : video_receive_streams_) + for (VideoReceiveStream* receive_stream : video_receive_streams_) { + receive_stream->Stop(); receiver_call_->DestroyVideoReceiveStream(receive_stream); + } sender_call_->DestroyVideoSendStream(video_send_stream_); }