Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video_engine / vie_receiver.h

diff --git a/src/third_party/webrtc/video_engine/vie_receiver.h b/src/third_party/webrtc/video_engine/vie_receiver.h
index 5cccb51..611db40 100644 (file)
--- a/src/third_party/webrtc/video_engine/vie_receiver.h
+++ b/src/third_party/webrtc/video_engine/vie_receiver.h
@@ -24,7 +24,6 @@
 namespace webrtc {
 
 class CriticalSectionWrapper;
-class Encryption;
 class FecReceiver;
 class ReceiveStatistics;
 class RemoteBitrateEstimator;
@@ -34,6 +33,7 @@ class RTPPayloadRegistry;
 class RtpReceiver;
 class RtpRtcp;
 class VideoCodingModule;
+struct ReceiveBandwidthEstimatorStats;
 
 class ViEReceiver : public RtpData {
  public:
@@ -52,9 +52,6 @@ class ViEReceiver : public RtpData {
   uint32_t GetRemoteSsrc() const;
   int GetCsrcs(uint32_t* csrcs) const;
 
-  int RegisterExternalDecryption(Encryption* decryption);
-  int DeregisterExternalDecryption();
-
   void SetRtpRtcpModule(RtpRtcp* module);
 
   RtpReceiver* GetRtpReceiver() const;
@@ -85,10 +82,13 @@ class ViEReceiver : public RtpData {
 
   void EstimatedReceiveBandwidth(unsigned int* available_bandwidth) const;
 
+  void GetReceiveBandwidthEstimatorStats(
+      ReceiveBandwidthEstimatorStats* output) const;
+
   ReceiveStatistics* GetReceiveStatistics() const;
 
  private:
-  int InsertRTPPacket(const int8_t* rtp_packet, int rtp_packet_length,
+  int InsertRTPPacket(const uint8_t* rtp_packet, int rtp_packet_length,
                       const PacketTime& packet_time);
   bool ReceivePacket(const uint8_t* packet,
                      int packet_length,
@@ -99,7 +99,7 @@ class ViEReceiver : public RtpData {
   bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
                                          int packet_length,
                                          const RTPHeader& header);
-  int InsertRTCPPacket(const int8_t* rtcp_packet, int rtcp_packet_length);
+  int InsertRTCPPacket(const uint8_t* rtcp_packet, int rtcp_packet_length);
   bool IsPacketInOrder(const RTPHeader& header) const;
   bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
 
@@ -115,8 +115,6 @@ class ViEReceiver : public RtpData {
   VideoCodingModule* vcm_;
   RemoteBitrateEstimator* remote_bitrate_estimator_;
 
-  Encryption* external_decryption_;
-  uint8_t* decryption_buffer_;
   RtpDump* rtp_dump_;
   bool receiving_;
   uint8_t restored_packet_[kViEMaxMtu];