Tweaked version of BBR for WebRTC.

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/modules/include/module.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/modules/pacing/pacer.h"
 #include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/rtc_base/optional.h"
 #include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 class AlrDetector;
 class BitrateProber;
 class Clock;
 class ProbeClusterCreatedObserver;
 class RtcEventLog;
 class IntervalBudget;
 
 namespace paced_sender {
+class IntervalBudget;

[terelius, 2017/08/18 14:34:03]

Can it be deleted?

[gnish1, 2017/08/18 14:53:50]

Done.

 struct Packet;
 class PacketQueue;
 }  // namespace paced_sender
 
-class PacedSender : public Module, public RtpPacketSender {
+class PacedSender : public Pacer {
  public:
   class PacketSender {
    public:
     // Note: packets sent as a result of a callback should not pass by this
     // module again.
     // Called when it's time to send a queued packet.
     // Returns false if packet cannot be sent.
     virtual bool TimeToSendPacket(uint32_t ssrc,
                                   uint16_t sequence_number,
                                   int64_t capture_time_ms,
@@ skipping 37 matching lines @@
   // Enable bitrate probing. Enabled by default, mostly here to simplify
   // testing. Must be called before any packets are being sent to have an
   // effect.
   void SetProbingEnabled(bool enabled);
 
   // Sets the estimated capacity of the network. Must be called once before
   // packets can be sent.
   // |bitrate_bps| is our estimate of what we are allowed to send on average.
   // We will pace out bursts of packets at a bitrate of
   // |bitrate_bps| * kDefaultPaceMultiplier.
-  virtual void SetEstimatedBitrate(uint32_t bitrate_bps);
+  void SetEstimatedBitrate(uint32_t bitrate_bps) override;
 
   // Sets the minimum send bitrate and maximum padding bitrate requested by send
   // streams.
   // |min_send_bitrate_bps| might be higher that the estimated available network
   // bitrate and if so, the pacer will send with |min_send_bitrate_bps|.
   // |max_padding_bitrate_bps| might be higher than the estimate available
   // network bitrate and if so, the pacer will send padding packets to reach
   // the min of the estimated available bitrate and |max_padding_bitrate_bps|.
   void SetSendBitrateLimits(int min_send_bitrate_bps,
                             int max_padding_bitrate_bps);
@@ skipping 35 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;
 
   // Called when the prober is associated with a process thread.
   void ProcessThreadAttached(ProcessThread* process_thread) override;
-
   void SetPacingFactor(float pacing_factor);
   void SetQueueTimeLimit(int limit_ms);
 
  private:
   // Updates the number of bytes that can be sent for the next time interval.
   void UpdateBudgetWithElapsedTime(int64_t delta_time_in_ms)
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
   void UpdateBudgetWithBytesSent(size_t bytes)
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
 
@@ skipping 31 matching lines @@
 
   std::unique_ptr<paced_sender::PacketQueue> packets_ GUARDED_BY(critsect_);
   uint64_t packet_counter_;
   ProcessThread* process_thread_ = nullptr;
 
   float pacing_factor_ GUARDED_BY(critsect_);
   int64_t queue_time_limit GUARDED_BY(critsect_);
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_PACING_PACED_SENDER_H_