Reland "Reland "Using units in SendSideBandwidthEstimation.""
This reverts commit a4de9c8b04ce9f7b1c4be639edd6cc4d3a9f07a1.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Revert "Reland "Using units in SendSideBandwidthEstimation.""
>
> This reverts commit e2cb26cb4fa2a3ce7c12636225ba9c720d7c7e56.
>
> Reason for revert: <INSERT REASONING HERE>
>
> Original change's description:
> > Reland "Using units in SendSideBandwidthEstimation."
> >
> > This reverts commit 917e5967a597fa8d6e6cae9ffccb21e3d35d553b.
> >
> > Reason for revert: Handling downstream use case.
> >
> > Original change's description:
> > > Revert "Using units in SendSideBandwidthEstimation."
> > >
> > > This reverts commit 35b5e5f3b0dc409bf571b3609860ad5bb8e00c29.
> > >
> > > Reason for revert: Breaks downstream project
> > >
> > > Original change's description:
> > > > Using units in SendSideBandwidthEstimation.
> > > >
> > > > This CL moves SendSideBandwidthEstimation to use the unit types
> > > > DataRate, TimeDelta and Timestamp. This prepares for upcoming changes.
> > > >
> > > > Bug: webrtc:9718
> > > > Change-Id: If10e329920dda037b53055ff3352ae7f8d7e32b8
> > > > Reviewed-on: https://webrtc-review.googlesource.com/c/104021
> > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org>
> > > > Cr-Commit-Position: refs/heads/master@{#25029}
> > >
> > > TBR=terelius@webrtc.org,srte@webrtc.org
> > >
> > > No-Try: True
> > > Bug: webrtc:9718
> > > Change-Id: Iaf470f1eec9911ee6fc7c1b4f5db9675d89d3780
> > > Reviewed-on: https://webrtc-review.googlesource.com/c/104480
> > > Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> > > Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#25035}
> >
> > TBR=oprypin@webrtc.org,terelius@webrtc.org,srte@webrtc.org
> >
> > Change-Id: I0940791fcd1e196598b0f0a2ec779c49931ee5df
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: webrtc:9718
> > Reviewed-on: https://webrtc-review.googlesource.com/c/104520
> > Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> > Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#25036}
>
> TBR=oprypin@webrtc.org,terelius@webrtc.org,srte@webrtc.org
>
> Change-Id: I6628771c79fc78dfd856649ae92232e95df63495
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:9718
> Reviewed-on: https://webrtc-review.googlesource.com/c/104540
> Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25037}
TBR=oprypin@webrtc.org,terelius@webrtc.org,srte@webrtc.org
Change-Id: If5473859cea725420afce11b6683fa0c70a29b0a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9718
Reviewed-on: https://webrtc-review.googlesource.com/c/104501
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25039}diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 13fbad3..a8d6850 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -41,6 +41,7 @@
deps = [
"../..:webrtc_common",
+ "../../api/units:data_rate",
"../../modules:module_api",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:checks",
diff --git a/modules/remote_bitrate_estimator/bwe_defines.cc b/modules/remote_bitrate_estimator/bwe_defines.cc
index 35f1d19..6cbe468 100644
--- a/modules/remote_bitrate_estimator/bwe_defines.cc
+++ b/modules/remote_bitrate_estimator/bwe_defines.cc
@@ -26,6 +26,10 @@
return kMinBitrateBps;
}
+DataRate GetMinBitrate() {
+ return DataRate::bps(GetMinBitrateBps());
+}
+
} // namespace congestion_controller
RateControlInput::RateControlInput(
diff --git a/modules/remote_bitrate_estimator/include/bwe_defines.h b/modules/remote_bitrate_estimator/include/bwe_defines.h
index 0d8c49b..d9185de 100644
--- a/modules/remote_bitrate_estimator/include/bwe_defines.h
+++ b/modules/remote_bitrate_estimator/include/bwe_defines.h
@@ -12,6 +12,7 @@
#define MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_
#include "absl/types/optional.h"
+#include "api/units/data_rate.h"
#define BWE_MAX(a, b) ((a) > (b) ? (a) : (b))
#define BWE_MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -20,6 +21,7 @@
namespace congestion_controller {
int GetMinBitrateBps();
+DataRate GetMinBitrate();
} // namespace congestion_controller
static const int64_t kBitrateWindowMs = 1000;