Protected streams report RTP messages directly to the FlexFec streams

webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
@@ skipping 41 matching lines @@
     return;
   }
   ProcessReceivedPackets();
 }
 
 FecPacketCounter FlexfecReceiver::GetPacketCounter() const {
   RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_);
   return packet_counter_;
 }
 
+// TODO(eladalon): We should be able to avoid FlexFEC-recovered packets
+// reaching back here, by making the OnRtpPacket() function take a parameter
+// such as |is_recovered|, which would be |true| for FlexFEC-recovered packets.

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

Seems a bit ugly to me since all rtp packet sinks would have to have this flag,
but only flex fec would care about it?

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

I see now that RtpPacketReceived::recovered() exists. I've changed to TODO
accordingly.

 bool FlexfecReceiver::AddReceivedPacket(const RtpPacketReceived& packet) {
   RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_);
 
   // RTP packets with a full base header (12 bytes), but without payload,
   // could conceivably be useful in the decoding. Therefore we check
   // with a non-strict inequality here.
   RTC_DCHECK_GE(packet.size(), kRtpHeaderSize);
 
   // Demultiplex based on SSRC, and insert into erasure code decoder.
   std::unique_ptr<ReceivedPacket> received_packet(new ReceivedPacket());
@@ skipping 14 matching lines @@
     received_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
     auto payload = packet.payload();
     memcpy(received_packet->pkt->data, payload.data(), payload.size());
     received_packet->pkt->length = payload.size();
   } else {
     // This is a media packet, or a FlexFEC packet belonging to some
     // other FlexFEC stream.
     if (received_packet->ssrc != protected_media_ssrc_) {
       return false;
     }
     received_packet->is_fec = false;

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

This looks suspect; TODO added and this bug filed:
https://bugs.chromium.org/p/webrtc/issues/detail?id=7954
(To be looked at in more detail later.)

 
     // Insert entire packet into erasure code.
     // TODO(brandtr): Remove this memcpy too.
     received_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
     memcpy(received_packet->pkt->data, packet.data(), packet.size());
     received_packet->pkt->length = packet.size();
   }
 
   received_packets_.push_back(std::move(received_packet));
   ++packet_counter_.num_packets;
@@ skipping 38 matching lines @@
           ForwardErrorCorrection::ParseSsrc(recovered_packet->pkt->data);
       LOG(LS_VERBOSE) << "Recovered media packet with SSRC: " << media_ssrc
                       << " from FlexFEC stream with SSRC: " << ssrc_ << ".";
       last_recovered_packet_ms_ = now_ms;
     }
   }
   return true;
 }
 
 }  // namespace webrtc