Reland of Use RtxReceiveStream.

webrtc/call/rtx_receive_stream.h

Index: webrtc/call/rtx_receive_stream.h
diff --git a/webrtc/call/rtx_receive_stream.h b/webrtc/call/rtx_receive_stream.h
index 418775c7780d3d349694e10b99063237d31e3d76..44907691a5096511eecd8353451a33d5e8d361be 100644
--- a/webrtc/call/rtx_receive_stream.h
+++ b/webrtc/call/rtx_receive_stream.h
@@ -17,13 +17,21 @@
 
 namespace webrtc {
 
+class ReceiveStatistics;
+
 // This class is responsible for RTX decapsulation. The resulting media packets
 // are passed on to a sink representing the associated media stream.
 class RtxReceiveStream : public RtpPacketSinkInterface {
  public:
   RtxReceiveStream(RtpPacketSinkInterface* media_sink,
                    std::map<int, int> associated_payload_types,
-                   uint32_t media_ssrc);
+                   uint32_t media_ssrc,
+                   // TODO(nisse): Should we make this argument

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

no, would rather see TODO to remove it once receive statistic will be common for
all streams:

it is not really job of the Rtx Stream to report incoming incoming packets to
statistic, it just simplest place to insert it for now.

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

Done.

+                   // mandatory? Ideally, generation of rtcp feedback
+                   // should be a responsibility of the
+                   // RtpStreamReceiverController, and then we
+                   // wouldn't need it here.
+                   ReceiveStatistics* rtp_receive_statistics = nullptr);
   ~RtxReceiveStream() override;
   // RtpPacketSinkInterface.
   void OnRtpPacket(const RtpPacketReceived& packet) override;
@@ -35,6 +43,7 @@ class RtxReceiveStream : public RtpPacketSinkInterface {
   // TODO(nisse): Ultimately, the media receive stream shouldn't care about the
   // ssrc, and we should delete this.
   const uint32_t media_ssrc_;
+  ReceiveStatistics* const rtp_receive_statistics_;
 };
 
 }  // namespace webrtc