Fix receiving FlexFEC in video_loopback.

webrtc/video/video_quality_test.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/video/video_quality_test.h"
@@ skipping 1856 matching lines @@
 
   test::DirectTransport recv_transport(params_.pipe, receiver_call_.get(),
                                        payload_type_map_);
 
   // TODO(ivica): Use two calls to be able to merge with RunWithAnalyzer or at
   // least share as much code as possible. That way this test would also match
   // the full stack tests better.
   send_transport.SetReceiver(receiver_call_->Receiver());
   recv_transport.SetReceiver(sender_call_->Receiver());
 
-  FlexfecReceiveStream* flexfec_receive_stream = nullptr;
   std::unique_ptr<test::VideoRenderer> local_preview;
   std::vector<std::unique_ptr<test::VideoRenderer>> loopback_renderers_;
   if (params_.video.enabled) {
     // Create video renderers.
     local_preview.reset(test::VideoRenderer::Create(
         "Local Preview", params_.video.width, params_.video.height));
 
     const size_t selected_stream_id = params_.ss.selected_stream;
     const size_t num_streams = params_.ss.streams.size();
 
@@ skipping 44 matching lines @@
     SetupAudio(voe.send_channel_id, voe.receive_channel_id, &send_transport,
                &audio_receive_stream);
   }
 
   for (VideoReceiveStream* receive_stream : video_receive_streams_)
     StartEncodedFrameLogs(receive_stream);
   StartEncodedFrameLogs(video_send_stream_);
 
   // 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();
     video_capturer_->Start();
   }
 
   if (params_.audio.enabled) {
     // Start receiving audio.
     audio_receive_stream->Start();
     EXPECT_EQ(0, voe.base->StartPlayout(voe.receive_channel_id));
@@ skipping 14 matching lines @@
     EXPECT_EQ(0, voe.base->StopPlayout(voe.receive_channel_id));
     audio_receive_stream->Stop();
     sender_call_->DestroyAudioSendStream(audio_send_stream_);
     receiver_call_->DestroyAudioReceiveStream(audio_receive_stream);
   }
 
   // Stop receiving and sending video.
   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_);
   }
 
   send_transport.StopSending();
   recv_transport.StopSending();
 
   if (params_.audio.enabled)
     DestroyVoiceEngine(&voe);
 }
 
@@ skipping 16 matching lines @@
   if (!params_.video.encoded_frame_base_path.empty()) {
     std::ostringstream str;
     str << receive_logs_++;
     std::string path =
         params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
     stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
                                         10000000);
   }
 }
 }  // namespace webrtc