Index: webrtc/modules/bitrate_controller/include/bitrate_controller.h |
diff --git a/webrtc/modules/bitrate_controller/include/bitrate_controller.h b/webrtc/modules/bitrate_controller/include/bitrate_controller.h |
index d6cbc02d189c1cdbc183a8c0ed86eb3cf51f4797..b18d1a1be44b6b2710ade22ad18e299f2983b2d9 100644 |
--- a/webrtc/modules/bitrate_controller/include/bitrate_controller.h |
+++ b/webrtc/modules/bitrate_controller/include/bitrate_controller.h |
@@ -18,6 +18,7 @@ |
#include <map> |
#include "webrtc/modules/include/module.h" |
+#include "webrtc/modules/pacing/paced_sender.h" |
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
namespace webrtc { |
@@ -26,6 +27,8 @@ class CriticalSectionWrapper; |
class RtcEventLog; |
struct PacketInfo; |
+// Deprecated |
+// TODO(perkj): Remove BitrateObserver when no implementations use it. |
class BitrateObserver { |
// Observer class for bitrate changes announced due to change in bandwidth |
// estimate or due to bitrate allocation changes. Fraction loss and rtt is |
@@ -46,10 +49,12 @@ class BitrateController : public Module { |
// estimation and divide the available bitrate between all its registered |
// BitrateObservers. |
public: |
- static const int kDefaultStartBitrateKbps = 300; |
+ static const int kDefaultStartBitratebps = 300000; |
static BitrateController* CreateBitrateController(Clock* clock, |
BitrateObserver* observer); |
+ static BitrateController* CreateBitrateController(Clock* clock); |
+ |
virtual ~BitrateController() {} |
virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() = 0; |
@@ -71,6 +76,10 @@ class BitrateController : public Module { |
virtual bool AvailableBandwidth(uint32_t* bandwidth) const = 0; |
virtual void SetReservedBitrate(uint32_t reserved_bitrate_bps) = 0; |
+ |
+ virtual bool GetNetworkParameters(uint32_t* bitrate, |
+ uint8_t* fraction_loss, |
+ int64_t* rtt) = 0; |
}; |
} // namespace webrtc |
#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_ |