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 2028 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?

[danilchap, 2017/07/24 09:03:46]

what are the alternatives to choose from?

[eladalon, 2017/07/24 13:15:48]

I found it unclear that DestroyFlexfecReceiveStream() is called from a different
class than CreateFlexfecReceiveStream(), but I don't think that's in this CL's
scope to fix. Other than that, it's probably better to RemoveSecondarySink()
explicitly, rather than have it triggered by DestroyFlexfecReceiveStream(). I'm
removing the TODO.

+        video_receive_stream->RemoveSecondarySink(flexfec_receive_stream);
+      }
       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_.logging.encoded_frame_base_path.empty()) {
     std::ostringstream str;
     str << receive_logs_++;
     std::string path =
         params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
     stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
                                         100000000);
   }
 }
 }  // namespace webrtc