Protected streams report RTP messages directly to the FlexFec streams

webrtc/video/rtp_video_stream_receiver.cc

Index: webrtc/video/rtp_video_stream_receiver.cc
diff --git a/webrtc/video/rtp_video_stream_receiver.cc b/webrtc/video/rtp_video_stream_receiver.cc
index 6b8ea0f45da013ca768771e512f07eaf78082548..bf211f2adc5aa089fedb69d0e83ec71b6e7d3590 100644
--- a/webrtc/video/rtp_video_stream_receiver.cc
+++ b/webrtc/video/rtp_video_stream_receiver.cc
@@ -10,6 +10,7 @@
 
 #include "webrtc/video/rtp_video_stream_receiver.h"
 
+#include <algorithm>
 #include <utility>
 #include <vector>
 
@@ -191,6 +192,8 @@ RtpVideoStreamReceiver::RtpVideoStreamReceiver(
 }
 
 RtpVideoStreamReceiver::~RtpVideoStreamReceiver() {
+  RTC_DCHECK(secondary_sinks_.empty());
+
   if (nack_module_) {
     process_thread_->DeRegisterModule(nack_module_.get());
   }
@@ -361,6 +364,29 @@ void RtpVideoStreamReceiver::OnRtpPacket(const RtpPacketReceived& packet) {
     rtp_receive_statistics_->IncomingPacket(
         header, packet.size(), IsPacketRetransmitted(header, in_order));
   }
+
+  for (auto* secondary_sink : secondary_sinks_) {
+    secondary_sink->OnRtpPacket(packet);

[danilchap, 2017/07/19 12:07:25]

can recovered packet trigger secondary_sink? should it?

[eladalon, 2017/07/21 14:42:08]

* This is in line with the behavior before this CL, where OnRtpPacket() got
triggered on those very sinks. The only difference here is that before it got
triggered from within RtpDemuxer, and now it's triggered from an intermediary
(RtpVideoStreamReceiver) which was itself triggered by RtpDemuxer.
* Please see here
https://codereview.webrtc.org/2974453002/diff/20001/webrtc/modules/rtp_rtcp/s...,
where I have a TODO in place for this general issue:
  // TODO(eladalon): Consider using packet.recovered() to avoid processing
  // recovered packets here.
* In either case, IMHO handling this issue had better be done in a separate CL
which would be based on top of this one. It would (1) keep the CLs small and
manageable, (2) allow partial rollback and (3) unblock other CLs which depends
on this CL, but not on the recovery issue.

+  }
+}
+
+void RtpVideoStreamReceiver::AddSecondarySink(RtpPacketSinkInterface* sink) {
+  RTC_DCHECK(std::find(secondary_sinks_.cbegin(), secondary_sinks_.cend(),
+                       sink) == secondary_sinks_.cend());
+  secondary_sinks_.push_back(sink);
+}
+
+void RtpVideoStreamReceiver::RemoveSecondarySink(
+    const RtpPacketSinkInterface* sink) {
+  auto it = std::find(secondary_sinks_.begin(), secondary_sinks_.end(), sink);
+  if (it == secondary_sinks_.end()) {
+    // We might be rolling-back a call whose setup failed mid-way. In such a
+    // case, it's simpler to remove "everything" rather than remember what
+    // has already been added.
+    LOG(LS_WARNING) << "Removal of unknown sink (" << sink << ").";
+    return;
+  }
+  secondary_sinks_.erase(it);
 }
 
 int32_t RtpVideoStreamReceiver::RequestKeyFrame() {