Protected streams report RTP messages directly to the FlexFec streams

webrtc/video/rtp_video_stream_receiver.h

Index: webrtc/video/rtp_video_stream_receiver.h
diff --git a/webrtc/video/rtp_video_stream_receiver.h b/webrtc/video/rtp_video_stream_receiver.h
index afcc696da16e78abdfe3a0729cca448d25c5aee7..45257162bd80280cc7f40e7df39aace375e6daa4 100644
--- a/webrtc/video/rtp_video_stream_receiver.h
+++ b/webrtc/video/rtp_video_stream_receiver.h
@@ -31,6 +31,7 @@
 #include "webrtc/modules/video_coding/sequence_number_util.h"
 #include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_receive_stream.h"
 
@@ -142,6 +143,9 @@ class RtpVideoStreamReceiver : public RtpData,
   rtc::Optional<int64_t> LastReceivedPacketMs() const;
   rtc::Optional<int64_t> LastReceivedKeyframePacketMs() const;
 
+  void AddSecondarySink(RtpPacketSinkInterface* sink);
+  void RemoveSecondarySink(const RtpPacketSinkInterface* sink);

[Taylor Brandstetter, 2017/07/31 15:59:25]

Can you add comments here documenting what a secondary sink represents?

[eladalon, 2017/07/31 16:46:03]

I've added this in video_receive_stream.h (following your comment; see latest
revision). Because this function isn't virtual, I've also copied it here, but
comment-duplication, while not as bad as code-duplication, is undesirable. Wdyt
should be done, if anything?
+danilchap@

[Taylor Brandstetter, 2017/07/31 17:31:29]

Comments in one place are good, as long as we're consistent about where they go.

+
  private:
   bool AddReceiveCodec(const VideoCodec& video_codec);
   void ReceivePacket(const uint8_t* packet,
@@ -201,6 +205,10 @@ class RtpVideoStreamReceiver : public RtpData,
   int16_t last_payload_type_ = -1;
 
   bool has_received_frame_;
+
+  rtc::ThreadChecker worker_thread_checker_;
+  std::vector<RtpPacketSinkInterface*> secondary_sinks_
+      GUARDED_BY(worker_thread_checker_);
 };
 
 }  // namespace webrtc