Reland of Use RtxReceiveStream.

webrtc/call/rtx_receive_stream.cc

Index: webrtc/call/rtx_receive_stream.cc
diff --git a/webrtc/call/rtx_receive_stream.cc b/webrtc/call/rtx_receive_stream.cc
index 16463525c729de224d6a1dfb9befe76d4617a25f..3f4c264c7d0815d7a0a740f08402f5a4aed74a2b 100644
--- a/webrtc/call/rtx_receive_stream.cc
+++ b/webrtc/call/rtx_receive_stream.cc
@@ -11,17 +11,21 @@
 #include <utility>
 
 #include "webrtc/call/rtx_receive_stream.h"
+#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
-RtxReceiveStream::RtxReceiveStream(RtpPacketSinkInterface* media_sink,
-                                   std::map<int, int> associated_payload_types,
-                                   uint32_t media_ssrc)
+RtxReceiveStream::RtxReceiveStream(
+    RtpPacketSinkInterface* media_sink,
+    std::map<int, int> associated_payload_types,
+    uint32_t media_ssrc,
+    ReceiveStatistics* rtp_receive_statistics /* = nullptr */)
     : media_sink_(media_sink),
       associated_payload_types_(std::move(associated_payload_types)),
-      media_ssrc_(media_ssrc) {
+      media_ssrc_(media_ssrc),
+      rtp_receive_statistics_(rtp_receive_statistics) {
   if (associated_payload_types_.empty()) {
     LOG(LS_WARNING)
         << "RtxReceiveStream created with empty payload type mapping.";
@@ -31,6 +35,14 @@ RtxReceiveStream::RtxReceiveStream(RtpPacketSinkInterface* media_sink,
 RtxReceiveStream::~RtxReceiveStream() = default;
 
 void RtxReceiveStream::OnRtpPacket(const RtpPacketReceived& rtx_packet) {
+  if (rtp_receive_statistics_) {
+    RTPHeader header;
+    rtx_packet.GetHeader(&header);
+    // RTX packets are never retransmitted.
+    const bool kNotRetransmitted = false;

[danilchap, 2017/09/06 10:29:52]

to avoid confusion about double negation (not retransmitted is false, can it
mean it is re-transmitted?)

suggest use inline comment to document the parameter:
->IncomingPacket(header, rtx_packet.size(), /*retransmitted=*/false);

or, if you prefer constant, negate later:
const bool kRetransmitted = true;
// RTX packets are never retransmitted.
->IncomingPacket(header, rtx_packet.size(), !kRetransmitted);

[nisse-webrtc, 2017/09/06 11:25:10]

I'm following the first suggestion. (The kNotRetransmitted thing was copied from
the corresponding FlexFEC code).

+    rtp_receive_statistics_->IncomingPacket(header, rtx_packet.size(),
+                                            kNotRetransmitted);
+  }
   rtc::ArrayView<const uint8_t> payload = rtx_packet.payload();
 
   if (payload.size() < kRtxHeaderSize) {