Move, almost, all receive side references to RTP to RtpStreamReceiver.

webrtc/video/rtp_stream_receiver.h

 /*
  *  Copyright (c) 2012 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 15 matching lines @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_receive_stream.h"
 
 namespace webrtc {
 
 class FecReceiver;
 class PacedSender;
 class PacketRouter;
+class ProcessThread;
 class RemoteNtpTimeEstimator;
 class ReceiveStatistics;
 class ReceiveStatisticsProxy;
 class RemoteBitrateEstimator;
 class RtcpRttStats;
 class RtpHeaderParser;
 class RTPPayloadRegistry;
 class RtpReceiver;
 class Transport;
+class VieRemb;
 
 namespace vcm {
 class VideoReceiver;
 }  // namespace vcm
 
 class RtpStreamReceiver : public RtpData, public RtpFeedback,
                           public VCMFrameTypeCallback,
                           public VCMPacketRequestCallback {
  public:
   RtpStreamReceiver(vcm::VideoReceiver* video_receiver,
                     RemoteBitrateEstimator* remote_bitrate_estimator,
                     Transport* transport,
                     RtcpRttStats* rtt_stats,
                     PacedSender* paced_sender,
                     PacketRouter* packet_router,
+                    VieRemb* remb,
                     const VideoReceiveStream::Config& config,
-                    ReceiveStatisticsProxy* receive_stats_proxy);
+                    ReceiveStatisticsProxy* receive_stats_proxy,
+                    ProcessThread* process_thread);
   ~RtpStreamReceiver();
 
   bool SetReceiveCodec(const VideoCodec& video_codec);
 
-  void SetRtxPayloadType(int payload_type, int associated_payload_type);
-  // If set to true, the RTX payload type mapping supplied in
-  // |SetRtxPayloadType| will be used when restoring RTX packets. Without it,
-  // RTX packets will always be restored to the last non-RTX packet payload type
-  // received.
-  void SetUseRtxPayloadMappingOnRestore(bool val);
-  void SetRtxSsrc(uint32_t ssrc);
-  bool GetRtxSsrc(uint32_t* ssrc) const;
-
-  bool IsFecEnabled() const;
-
   uint32_t GetRemoteSsrc() const;
   int GetCsrcs(uint32_t* csrcs) const;
 
   RtpReceiver* GetRtpReceiver() const;
   RtpRtcp* rtp_rtcp() const { return rtp_rtcp_.get(); }
 
-  void EnableReceiveRtpHeaderExtension(const std::string& extension, int id);
-
   void StartReceive();
   void StopReceive();
 
   bool DeliverRtp(const uint8_t* rtp_packet,
                   size_t rtp_packet_length,
                   const PacketTime& packet_time);
   bool DeliverRtcp(const uint8_t* rtcp_packet, size_t rtcp_packet_length);
 
+  void SignalNetworkState(NetworkState state);
+
   // Implements RtpData.
   int32_t OnReceivedPayloadData(const uint8_t* payload_data,
                                 const size_t payload_size,
                                 const WebRtcRTPHeader* rtp_header) override;
   bool OnRecoveredPacket(const uint8_t* packet, size_t packet_length) override;
 
   // Implements RtpFeedback.
   int32_t OnInitializeDecoder(const int8_t payload_type,
                               const char payload_name[RTP_PAYLOAD_NAME_SIZE],
                               const int frequency,
                               const size_t channels,
                               const uint32_t rate) override;
   void OnIncomingSSRCChanged(const uint32_t ssrc) override;
   void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) override {}
 
   // Implements VCMFrameTypeCallback.
   int32_t RequestKeyFrame() override;
   int32_t SliceLossIndicationRequest(const uint64_t picture_id) override;
 
+  bool IsFecEnabled() const;
+  bool IsRetransmissionsEnabled() const;
+  void RequestPacketRetransmit(const std::vector<uint16_t>& sequence_numbers);
+
   // Implements VCMPacketRequestCallback.
   int32_t ResendPackets(const uint16_t* sequenceNumbers,
                         uint16_t length) override;
 
-  ReceiveStatistics* GetReceiveStatistics() const;
-
  private:
   bool ReceivePacket(const uint8_t* packet,
                      size_t packet_length,
                      const RTPHeader& header,
                      bool in_order);
   // Parses and handles for instance RTX and RED headers.
   // This function assumes that it's being called from only one thread.
   bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
                                          size_t packet_length,
                                          const RTPHeader& header);
   void NotifyReceiverOfFecPacket(const RTPHeader& header);
   bool IsPacketInOrder(const RTPHeader& header) const;
   bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
   void UpdateHistograms();
+  void EnableReceiveRtpHeaderExtension(const std::string& extension, int id);
 
   Clock* const clock_;
+  const VideoReceiveStream::Config config_;
   vcm::VideoReceiver* const video_receiver_;
   RemoteBitrateEstimator* const remote_bitrate_estimator_;
   PacketRouter* const packet_router_;
+  VieRemb* const remb_;
+  ProcessThread* const process_thread_;
 
   RemoteNtpTimeEstimator ntp_estimator_;
   RTPPayloadRegistry rtp_payload_registry_;
 
   const std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
   const std::unique_ptr<RtpReceiver> rtp_receiver_;
   const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
   std::unique_ptr<FecReceiver> fec_receiver_;
 
   rtc::CriticalSection receive_cs_;
   bool receiving_ GUARDED_BY(receive_cs_);
   uint8_t restored_packet_[IP_PACKET_SIZE] GUARDED_BY(receive_cs_);
   bool restored_packet_in_use_ GUARDED_BY(receive_cs_);
   int64_t last_packet_log_ms_ GUARDED_BY(receive_cs_);
 
   const std::unique_ptr<RtpRtcp> rtp_rtcp_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_