Removed all RTP dependencies from ViEChannel and renamed class.

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.
  */
 
 #ifndef WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
 #define WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
 
 #include <list>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/engine_configurations.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #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 RemoteNtpTimeEstimator;
 class ReceiveStatistics;
 class RemoteBitrateEstimator;
+class RtcpPacketTypeCounterObserver;
 class RtcpRttStats;
+class RtcpStatisticsCallback;
 class RtpHeaderParser;
 class RTPPayloadRegistry;
 class RtpReceiver;
+class StreamDataCountersCallback;
 class Transport;
 
 namespace vcm {
 class VideoReceiver;
 }  // namespace vcm
 
-class RtpStreamReceiver : public RtpData, public RtpFeedback  {
+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);
+                    PacketRouter* packet_router,
+                    const VideoReceiveStream::Config& config,
+                    StreamDataCountersCallback* stream_data_counters_callback,
+                    RtcpStatisticsCallback* rtcp_statistics_callback,
+                    RtcpPacketTypeCounterObserver* rtcp_counter_observer);
   ~RtpStreamReceiver();
 
   bool SetReceiveCodec(const VideoCodec& video_codec);
 
-  void SetNackStatus(bool enable, int max_nack_reordering_threshold);
   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 RegisterRtcpPacketTypeCounterObserver(
-      RtcpPacketTypeCounterObserver* observer);
 
   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);
 
   // 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;
+
+  // Implements VCMPacketRequestCallback.
+  int32_t ResendPackets(const uint16_t* sequenceNumbers,
+                        uint16_t length) override;
+
   ReceiveStatistics* GetReceiveStatistics() const;
 
-  template <class T>
-  class RegisterableCallback : public T {
-   public:
-    RegisterableCallback() : callback_(nullptr) {}
-
-    void Set(T* callback) {
-      rtc::CritScope lock(&critsect_);
-      callback_ = callback;
-    }
-
-   protected:
-    // Note: this should be implemented with a RW-lock to allow simultaneous
-    // calls into the callback. However that doesn't seem to be needed for the
-    // current type of callbacks covered by this class.
-    rtc::CriticalSection critsect_;
-    T* callback_ GUARDED_BY(critsect_);
-
-   private:
-    RTC_DISALLOW_COPY_AND_ASSIGN(RegisterableCallback);
-  };
-
-  class RegisterableRtcpPacketTypeCounterObserver
-      : public RegisterableCallback<RtcpPacketTypeCounterObserver> {
-   public:
-    void RtcpPacketTypesCounterUpdated(
-        uint32_t ssrc,
-        const RtcpPacketTypeCounter& packet_counter) override {
-      rtc::CritScope lock(&critsect_);
-      if (callback_)
-        callback_->RtcpPacketTypesCounterUpdated(ssrc, packet_counter);
-    }
-
-   private:
-  } rtcp_packet_type_counter_observer_;
-
  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);
@@ skipping 20 matching lines @@
   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_