Upstream version 5.34.104.0

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

diff --git a/src/third_party/webrtc/video_engine/vie_channel.h b/src/third_party/webrtc/video_engine/vie_channel.h
index be961d5..762f521 100644 (file)
--- a/src/third_party/webrtc/video_engine/vie_channel.h
+++ b/src/third_party/webrtc/video_engine/vie_channel.h
@@ -34,7 +34,6 @@ class ChannelStatsObserver;
 class Config;
 class CriticalSectionWrapper;
 class EncodedImageCallback;
-class Encryption;
 class I420FrameCallback;
 class PacedSender;
 class ProcessThread;
@@ -209,6 +208,8 @@ class ViEChannel
                          uint32_t* nackBitrateSent) const;
   bool GetSendSideDelay(int* avg_send_delay, int* max_send_delay) const;
   void GetEstimatedReceiveBandwidth(uint32_t* estimated_bandwidth) const;
+  void GetReceiveBandwidthEstimatorStats(
+      ReceiveBandwidthEstimatorStats* output) const;
 
   // Called on any new send bitrate estimate.
   void RegisterSendBitrateObserver(BitrateStatisticsObserver* observer);
@@ -331,9 +332,6 @@ class ViEChannel
   virtual int32_t ResendPackets(const uint16_t* sequence_numbers,
                                 uint16_t length);
 
-  int32_t RegisterExternalEncryption(Encryption* encryption);
-  int32_t DeRegisterExternalEncryption();
-
   int32_t SetVoiceChannel(int32_t ve_channel_id,
                           VoEVideoSync* ve_sync_interface);
   int32_t VoiceChannel();
@@ -413,8 +411,6 @@ class ViEChannel
   bool wait_for_key_frame_;
   ThreadWrapper* decode_thread_;
 
-  Encryption* external_encryption_;
-
   ViEEffectFilter* effect_filter_;
   bool color_enhancement_;