Add AlrDetector

webrtc/modules/pacing/paced_sender.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_MODULES_PACING_PACED_SENDER_H_
 #define WEBRTC_MODULES_PACING_PACED_SENDER_H_
 
 #include <list>
 #include <memory>
 #include <set>
 
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
+class AlrDetector;
 class BitrateProber;
 class Clock;
 class CriticalSectionWrapper;
 
 namespace paced_sender {
 class IntervalBudget;
 struct Packet;
 class PacketQueue;
 }  // namespace paced_sender
 
@@ skipping 11 matching lines @@
                                   bool retransmission,
                                   int probe_cluster_id) = 0;
     // Called when it's a good time to send a padding data.
     // Returns the number of bytes sent.
     virtual size_t TimeToSendPadding(size_t bytes, int probe_cluster_id) = 0;
 
    protected:
     virtual ~PacketSender() {}
   };
 
+  class PacingObserver {

[stefan-webrtc, 2016/09/27 14:26:09]

Wouldn't it be simpler to let the PacedSender own the AlrDetector to avoid this
Observer interface? Anyone who wants to know if we are app limited could then
ask the PacedSender. Seems a bit involved right now.

+   public:
+    virtual void OnBytesSent(size_t bytes_sent, int64_t elapsed_time_ms) = 0;
+
+   protected:
+    virtual ~PacingObserver() {}
+  };
+
   // Expected max pacer delay in ms. If ExpectedQueueTimeMs() is higher than
   // this value, the packet producers should wait (eg drop frames rather than
   // encoding them). Bitrate sent may temporarily exceed target set by
   // UpdateBitrate() so that this limit will be upheld.
   static const int64_t kMaxQueueLengthMs;
   // Pacing-rate relative to our target send rate.
   // Multiplicative factor that is applied to the target bitrate to calculate
   // the number of bytes that can be transmitted per interval.
   // Increasing this factor will result in lower delays in cases of bitrate
   // overshoots from the encoder.
   static const float kDefaultPaceMultiplier;
 
   static const size_t kMinProbePacketSize = 200;
 
   PacedSender(Clock* clock,
-              PacketSender* packet_sender);
+              PacketSender* packet_sender,
+              PacingObserver* pacing_observer);
+  PacedSender(Clock* clock, PacketSender* packet_sender);
 
   virtual ~PacedSender();
 
   virtual void CreateProbeCluster(int bitrate_bps, int num_packets);
 
   // Temporarily pause all sending.
   void Pause();
 
   // Resume sending packets.
   void Resume();
@@ skipping 44 matching lines @@
 
   // Returns the number of milliseconds until the module want a worker thread
   // to call Process.
   int64_t TimeUntilNextProcess() override;
 
   // Process any pending packets in the queue(s).
   void Process() override;
 
  private:
   // Updates the number of bytes that can be sent for the next time interval.
-  void UpdateBytesPerInterval(int64_t delta_time_in_ms)
+  void UpdateBudgetWithElapsedTime(int64_t delta_time_in_ms)
+      EXCLUSIVE_LOCKS_REQUIRED(critsect_);
+  void UpdateBudgetWithBytesSent(size_t bytes)
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
 
   bool SendPacket(const paced_sender::Packet& packet, int probe_cluster_id)
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
   size_t SendPadding(size_t padding_needed, int probe_cluster_id)
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
 
   Clock* const clock_;
   PacketSender* const packet_sender_;
+  PacingObserver* const pacing_observer_;
 
   std::unique_ptr<CriticalSectionWrapper> critsect_;
   bool paused_ GUARDED_BY(critsect_);
   // This is the media budget, keeping track of how many bits of media
   // we can pace out during the current interval.
   std::unique_ptr<paced_sender::IntervalBudget> media_budget_
       GUARDED_BY(critsect_);
   // This is the padding budget, keeping track of how many bits of padding we're
   // allowed to send out during the current interval. This budget will be
   // utilized when there's no media to send.
   std::unique_ptr<paced_sender::IntervalBudget> padding_budget_
       GUARDED_BY(critsect_);
 
   std::unique_ptr<BitrateProber> prober_ GUARDED_BY(critsect_);
   // Actual configured bitrates (media_budget_ may temporarily be higher in
   // order to meet pace time constraint).
   uint32_t estimated_bitrate_bps_ GUARDED_BY(critsect_);
   uint32_t min_send_bitrate_kbps_ GUARDED_BY(critsect_);
   uint32_t max_padding_bitrate_kbps_ GUARDED_BY(critsect_);
   uint32_t pacing_bitrate_kbps_ GUARDED_BY(critsect_);
 
   int64_t time_last_update_us_ GUARDED_BY(critsect_);
 
   std::unique_ptr<paced_sender::PacketQueue> packets_ GUARDED_BY(critsect_);
   uint64_t packet_counter_;
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_PACING_PACED_SENDER_H_