mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 14:50:39 +01:00

This reverts commita4de9c8b04
. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Using units in SendSideBandwidthEstimation."" > > This reverts commite2cb26cb4f
. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Reland "Using units in SendSideBandwidthEstimation." > > > > This reverts commit917e5967a5
. > > > > Reason for revert: Handling downstream use case. > > > > Original change's description: > > > Revert "Using units in SendSideBandwidthEstimation." > > > > > > This reverts commit35b5e5f3b0
. > > > > > > 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}
174 lines
6.2 KiB
C++
174 lines
6.2 KiB
C++
/*
|
|
* Copyright (c) 2014 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.
|
|
*/
|
|
|
|
#include <algorithm>
|
|
#include <vector>
|
|
|
|
#include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h"
|
|
#include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
|
|
#include "modules/bitrate_controller/send_side_bandwidth_estimation.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
MATCHER(LossBasedBweUpdateWithBitrateOnly, "") {
|
|
if (arg->GetType() != RtcEvent::Type::BweUpdateLossBased) {
|
|
return false;
|
|
}
|
|
auto bwe_event = static_cast<RtcEventBweUpdateLossBased*>(arg);
|
|
return bwe_event->bitrate_bps_ > 0 && bwe_event->fraction_loss_ == 0;
|
|
}
|
|
|
|
MATCHER(LossBasedBweUpdateWithBitrateAndLossFraction, "") {
|
|
if (arg->GetType() != RtcEvent::Type::BweUpdateLossBased) {
|
|
return false;
|
|
}
|
|
auto bwe_event = static_cast<RtcEventBweUpdateLossBased*>(arg);
|
|
return bwe_event->bitrate_bps_ > 0 && bwe_event->fraction_loss_ > 0;
|
|
}
|
|
|
|
void TestProbing(bool use_delay_based) {
|
|
testing::NiceMock<MockRtcEventLog> event_log;
|
|
SendSideBandwidthEstimation bwe(&event_log);
|
|
int64_t now_ms = 0;
|
|
bwe.SetMinMaxBitrate(DataRate::bps(100000), DataRate::bps(1500000));
|
|
bwe.SetSendBitrate(DataRate::bps(200000), Timestamp::ms(now_ms));
|
|
|
|
const int kRembBps = 1000000;
|
|
const int kSecondRembBps = kRembBps + 500000;
|
|
|
|
bwe.UpdateReceiverBlock(0, TimeDelta::ms(50), 1, Timestamp::ms(now_ms));
|
|
|
|
// Initial REMB applies immediately.
|
|
if (use_delay_based) {
|
|
bwe.UpdateDelayBasedEstimate(Timestamp::ms(now_ms),
|
|
DataRate::bps(kRembBps));
|
|
} else {
|
|
bwe.UpdateReceiverEstimate(Timestamp::ms(now_ms), DataRate::bps(kRembBps));
|
|
}
|
|
bwe.UpdateEstimate(Timestamp::ms(now_ms));
|
|
int bitrate;
|
|
uint8_t fraction_loss;
|
|
int64_t rtt;
|
|
bwe.CurrentEstimate(&bitrate, &fraction_loss, &rtt);
|
|
EXPECT_EQ(kRembBps, bitrate);
|
|
|
|
// Second REMB doesn't apply immediately.
|
|
now_ms += 2001;
|
|
if (use_delay_based) {
|
|
bwe.UpdateDelayBasedEstimate(Timestamp::ms(now_ms),
|
|
DataRate::bps(kSecondRembBps));
|
|
} else {
|
|
bwe.UpdateReceiverEstimate(Timestamp::ms(now_ms),
|
|
DataRate::bps(kSecondRembBps));
|
|
}
|
|
bwe.UpdateEstimate(Timestamp::ms(now_ms));
|
|
bitrate = 0;
|
|
bwe.CurrentEstimate(&bitrate, &fraction_loss, &rtt);
|
|
EXPECT_EQ(kRembBps, bitrate);
|
|
}
|
|
|
|
TEST(SendSideBweTest, InitialRembWithProbing) {
|
|
TestProbing(false);
|
|
}
|
|
|
|
TEST(SendSideBweTest, InitialDelayBasedBweWithProbing) {
|
|
TestProbing(true);
|
|
}
|
|
|
|
TEST(SendSideBweTest, DoesntReapplyBitrateDecreaseWithoutFollowingRemb) {
|
|
MockRtcEventLog event_log;
|
|
EXPECT_CALL(event_log, LogProxy(LossBasedBweUpdateWithBitrateOnly()))
|
|
.Times(1);
|
|
EXPECT_CALL(event_log,
|
|
LogProxy(LossBasedBweUpdateWithBitrateAndLossFraction()))
|
|
.Times(1);
|
|
SendSideBandwidthEstimation bwe(&event_log);
|
|
static const int kMinBitrateBps = 100000;
|
|
static const int kInitialBitrateBps = 1000000;
|
|
int64_t now_ms = 1000;
|
|
bwe.SetMinMaxBitrate(DataRate::bps(kMinBitrateBps), DataRate::bps(1500000));
|
|
bwe.SetSendBitrate(DataRate::bps(kInitialBitrateBps), Timestamp::ms(now_ms));
|
|
|
|
static const uint8_t kFractionLoss = 128;
|
|
static const int64_t kRttMs = 50;
|
|
now_ms += 10000;
|
|
|
|
int bitrate_bps;
|
|
uint8_t fraction_loss;
|
|
int64_t rtt_ms;
|
|
bwe.CurrentEstimate(&bitrate_bps, &fraction_loss, &rtt_ms);
|
|
EXPECT_EQ(kInitialBitrateBps, bitrate_bps);
|
|
EXPECT_EQ(0, fraction_loss);
|
|
EXPECT_EQ(0, rtt_ms);
|
|
|
|
// Signal heavy loss to go down in bitrate.
|
|
bwe.UpdateReceiverBlock(kFractionLoss, TimeDelta::ms(kRttMs), 100,
|
|
Timestamp::ms(now_ms));
|
|
// Trigger an update 2 seconds later to not be rate limited.
|
|
now_ms += 1000;
|
|
bwe.UpdateEstimate(Timestamp::ms(now_ms));
|
|
|
|
bwe.CurrentEstimate(&bitrate_bps, &fraction_loss, &rtt_ms);
|
|
EXPECT_LT(bitrate_bps, kInitialBitrateBps);
|
|
// Verify that the obtained bitrate isn't hitting the min bitrate, or this
|
|
// test doesn't make sense. If this ever happens, update the thresholds or
|
|
// loss rates so that it doesn't hit min bitrate after one bitrate update.
|
|
EXPECT_GT(bitrate_bps, kMinBitrateBps);
|
|
EXPECT_EQ(kFractionLoss, fraction_loss);
|
|
EXPECT_EQ(kRttMs, rtt_ms);
|
|
|
|
// Triggering an update shouldn't apply further downgrade nor upgrade since
|
|
// there's no intermediate receiver block received indicating whether this is
|
|
// currently good or not.
|
|
int last_bitrate_bps = bitrate_bps;
|
|
// Trigger an update 2 seconds later to not be rate limited (but it still
|
|
// shouldn't update).
|
|
now_ms += 1000;
|
|
bwe.UpdateEstimate(Timestamp::ms(now_ms));
|
|
bwe.CurrentEstimate(&bitrate_bps, &fraction_loss, &rtt_ms);
|
|
|
|
EXPECT_EQ(last_bitrate_bps, bitrate_bps);
|
|
// The old loss rate should still be applied though.
|
|
EXPECT_EQ(kFractionLoss, fraction_loss);
|
|
EXPECT_EQ(kRttMs, rtt_ms);
|
|
}
|
|
|
|
TEST(SendSideBweTest, SettingSendBitrateOverridesDelayBasedEstimate) {
|
|
::testing::NiceMock<MockRtcEventLog> event_log;
|
|
SendSideBandwidthEstimation bwe(&event_log);
|
|
static const int kMinBitrateBps = 10000;
|
|
static const int kMaxBitrateBps = 10000000;
|
|
static const int kInitialBitrateBps = 300000;
|
|
static const int kDelayBasedBitrateBps = 350000;
|
|
static const int kForcedHighBitrate = 2500000;
|
|
|
|
int64_t now_ms = 0;
|
|
int bitrate_bps;
|
|
uint8_t fraction_loss;
|
|
int64_t rtt_ms;
|
|
|
|
bwe.SetMinMaxBitrate(DataRate::bps(kMinBitrateBps),
|
|
DataRate::bps(kMaxBitrateBps));
|
|
bwe.SetSendBitrate(DataRate::bps(kInitialBitrateBps), Timestamp::ms(now_ms));
|
|
|
|
bwe.UpdateDelayBasedEstimate(Timestamp::ms(now_ms),
|
|
DataRate::bps(kDelayBasedBitrateBps));
|
|
bwe.UpdateEstimate(Timestamp::ms(now_ms));
|
|
bwe.CurrentEstimate(&bitrate_bps, &fraction_loss, &rtt_ms);
|
|
EXPECT_GE(bitrate_bps, kInitialBitrateBps);
|
|
EXPECT_LE(bitrate_bps, kDelayBasedBitrateBps);
|
|
|
|
bwe.SetSendBitrate(DataRate::bps(kForcedHighBitrate), Timestamp::ms(now_ms));
|
|
bwe.CurrentEstimate(&bitrate_bps, &fraction_loss, &rtt_ms);
|
|
EXPECT_EQ(bitrate_bps, kForcedHighBitrate);
|
|
}
|
|
|
|
} // namespace webrtc
|