Protected streams report RTP messages directly to the FlexFec streams

webrtc/video/video_quality_test.cc

Index: webrtc/video/video_quality_test.cc
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index 5e99b50ff0c297404be5e8eca2e75001b4e953e5..6dea001411c363e952de75a207dc0a4fc4f72740 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -1983,6 +1983,11 @@ void VideoQualityTest::RunWithRenderers(const Params& params) {
     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);
     }