Protected streams report RTP messages directly to the FlexFec streams

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 1965 matching lines @@
     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 (FlexfecReceiveStream* flexfec_receive_stream :
          flexfec_receive_streams_) {
+      for (VideoReceiveStream* video_receive_stream : video_receive_streams_) {
+        // TODO(eladalon): !!! Discuss with reviewers - do we perhaps want
+        // something else to be in charge of removing the secondary sinks?
+        video_receive_stream->RemoveSecondarySink(flexfec_receive_stream);
+      }

[stefan-webrtc, 2017/07/07 09:36:24]

I think it should be done the same way it would've been done in
webrtcvideoengine2.cc

[eladalon, 2017/07/07 14:16:24]

Sorry, I was unclear - this discussion is not really about this particular call
to RemoveSecondarySink(). I'm thinking - we could also have the secondary sink
know the primary sink, and have either destructor break the connection on both
ends, for instance.
(By the way, webrtcvideoengine2.cc has been renamed to webrtcvideoengine.cc.)

       flexfec_receive_stream->Stop();
       receiver_call_->DestroyFlexfecReceiveStream(flexfec_receive_stream);
     }
     for (VideoReceiveStream* receive_stream : video_receive_streams_) {
       receive_stream->Stop();
       receiver_call_->DestroyVideoReceiveStream(receive_stream);
     }
     sender_call_->DestroyVideoSendStream(video_send_stream_);
   }
 
@@ skipping 23 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