Reland of Use RtxReceiveStream.

webrtc/call/rtx_receive_stream.h

 /*
  *  Copyright (c) 2017 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.
  */
 
 #ifndef WEBRTC_CALL_RTX_RECEIVE_STREAM_H_
 #define WEBRTC_CALL_RTX_RECEIVE_STREAM_H_
 
 #include <map>
 
 #include "webrtc/call/rtp_packet_sink_interface.h"
 
 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;
 
  private:
   RtpPacketSinkInterface* const media_sink_;
   // Map from rtx payload type -> media payload type.
   const std::map<int, int> associated_payload_types_;
   // 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
 
 #endif  // WEBRTC_CALL_RTX_RECEIVE_STREAM_H_