Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1337)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc

Issue 1376423002: Make overuse estimator one dimensional. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/inter_arrival.cc ('k') | webrtc/modules/remote_bitrate_estimator/overuse_detector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc b/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
index 64f7ccae6bdeba7a204c6bcc0defc68efa71dac1..dfe324cdcefb1c6e484cdff19a0e0746fa3d3824 100644
--- a/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
@@ -45,34 +45,30 @@ class InterArrivalTest : public ::testing::Test {
// Test that neither inter_arrival instance complete the timestamp group from
// the given data.
- void ExpectFalse(int64_t timestamp_us, int64_t arrival_time_ms,
- size_t packet_size) {
+ void ExpectFalse(int64_t timestamp_us, int64_t arrival_time_ms) {
InternalExpectFalse(inter_arrival_rtp_.get(),
- MakeRtpTimestamp(timestamp_us), arrival_time_ms,
- packet_size);
+ MakeRtpTimestamp(timestamp_us), arrival_time_ms);
InternalExpectFalse(inter_arrival_ast_.get(), MakeAbsSendTime(timestamp_us),
- arrival_time_ms, packet_size);
+ arrival_time_ms);
}
// Test that both inter_arrival instances complete the timestamp group from
// the given data and that all returned deltas are as expected (except
// timestamp delta, which is rounded from us to different ranges and must
// match within an interval, given in |timestamp_near].
- void ExpectTrue(int64_t timestamp_us, int64_t arrival_time_ms,
- size_t packet_size, int64_t expected_timestamp_delta_us,
+ void ExpectTrue(int64_t timestamp_us,
+ int64_t arrival_time_ms,
+ int64_t expected_timestamp_delta_us,
int64_t expected_arrival_time_delta_ms,
- int expected_packet_size_delta,
uint32_t timestamp_near) {
InternalExpectTrue(inter_arrival_rtp_.get(), MakeRtpTimestamp(timestamp_us),
- arrival_time_ms, packet_size,
+ arrival_time_ms,
MakeRtpTimestamp(expected_timestamp_delta_us),
- expected_arrival_time_delta_ms,
- expected_packet_size_delta, timestamp_near);
+ expected_arrival_time_delta_ms, timestamp_near);
InternalExpectTrue(inter_arrival_ast_.get(), MakeAbsSendTime(timestamp_us),
- arrival_time_ms, packet_size,
+ arrival_time_ms,
MakeAbsSendTime(expected_timestamp_delta_us),
- expected_arrival_time_delta_ms,
- expected_packet_size_delta, timestamp_near << 8);
+ expected_arrival_time_delta_ms, timestamp_near << 8);
}
void WrapTestHelper(int64_t wrap_start_us, uint32_t timestamp_near,
@@ -82,29 +78,29 @@ class InterArrivalTest : public ::testing::Test {
// G1
int64_t arrival_time = 17;
- ExpectFalse(0, arrival_time, 1);
+ ExpectFalse(0, arrival_time);
// G2
arrival_time += kBurstThresholdMs + 1;
- ExpectFalse(wrap_start_us / 4, arrival_time, 1);
+ ExpectFalse(wrap_start_us / 4, arrival_time);
// G3
arrival_time += kBurstThresholdMs + 1;
- ExpectTrue(wrap_start_us / 2, arrival_time, 1,
- wrap_start_us / 4, 6, 0, // Delta G2-G1
+ ExpectTrue(wrap_start_us / 2, arrival_time, wrap_start_us / 4,
+ 6, // Delta G2-G1
0);
// G4
arrival_time += kBurstThresholdMs + 1;
int64_t g4_arrival_time = arrival_time;
- ExpectTrue(wrap_start_us / 2 + wrap_start_us / 4, arrival_time, 1,
- wrap_start_us / 4, 6, 0, // Delta G3-G2
+ ExpectTrue(wrap_start_us / 2 + wrap_start_us / 4, arrival_time,
+ wrap_start_us / 4, 6, // Delta G3-G2
timestamp_near);
// G5
arrival_time += kBurstThresholdMs + 1;
- ExpectTrue(wrap_start_us, arrival_time, 2,
- wrap_start_us / 4, 6, 0, // Delta G4-G3
+ ExpectTrue(wrap_start_us, arrival_time, wrap_start_us / 4,
+ 6, // Delta G4-G3
timestamp_near);
for (int i = 0; i < 10; ++i) {
// Slowly step across the wrap point.
@@ -113,39 +109,34 @@ class InterArrivalTest : public ::testing::Test {
// These packets arrive with timestamps in decreasing order but are
// nevertheless accumulated to group because their timestamps are higher
// than the initial timestamp of the group.
- ExpectFalse(wrap_start_us + kMinStep * (9 - i), arrival_time, 1);
+ ExpectFalse(wrap_start_us + kMinStep * (9 - i), arrival_time);
} else {
- ExpectFalse(wrap_start_us + kMinStep * i, arrival_time, 1);
+ ExpectFalse(wrap_start_us + kMinStep * i, arrival_time);
}
}
int64_t g5_arrival_time = arrival_time;
// This packet is out of order and should be dropped.
arrival_time += kBurstThresholdMs + 1;
- ExpectFalse(wrap_start_us - 100, arrival_time, 100);
+ ExpectFalse(wrap_start_us - 100, arrival_time);
// G6
arrival_time += kBurstThresholdMs + 1;
int64_t g6_arrival_time = arrival_time;
- ExpectTrue(wrap_start_us + kTriggerNewGroupUs, arrival_time, 10,
+ ExpectTrue(wrap_start_us + kTriggerNewGroupUs, arrival_time,
wrap_start_us / 4 + 9 * kMinStep,
- g5_arrival_time - g4_arrival_time,
- (2 + 10) - 1, // Delta G5-G4
- timestamp_near);
+ g5_arrival_time - g4_arrival_time, timestamp_near);
// This packet is out of order and should be dropped.
arrival_time += kBurstThresholdMs + 1;
- ExpectFalse(wrap_start_us + kTimestampGroupLengthUs, arrival_time, 100);
+ ExpectFalse(wrap_start_us + kTimestampGroupLengthUs, arrival_time);
// G7
arrival_time += kBurstThresholdMs + 1;
- ExpectTrue(wrap_start_us + 2 * kTriggerNewGroupUs,
- arrival_time, 100,
+ ExpectTrue(wrap_start_us + 2 * kTriggerNewGroupUs, arrival_time,
// Delta G6-G5
kTriggerNewGroupUs - 9 * kMinStep,
- g6_arrival_time - g5_arrival_time,
- 10 - (2 + 10),
- timestamp_near);
+ g6_arrival_time - g5_arrival_time, timestamp_near);
}
private:
@@ -160,43 +151,29 @@ class InterArrivalTest : public ::testing::Test {
}
static void InternalExpectFalse(InterArrival* inter_arrival,
- uint32_t timestamp, int64_t arrival_time_ms,
- size_t packet_size) {
+ uint32_t timestamp,
+ int64_t arrival_time_ms) {
uint32_t dummy_timestamp = 101;
int64_t dummy_arrival_time_ms = 303;
- int dummy_packet_size = 909;
- bool computed = inter_arrival->ComputeDeltas(timestamp,
- arrival_time_ms,
- packet_size,
- &dummy_timestamp,
- &dummy_arrival_time_ms,
- &dummy_packet_size);
+ bool computed = inter_arrival->ComputeDeltas(
+ timestamp, arrival_time_ms, &dummy_timestamp, &dummy_arrival_time_ms);
EXPECT_EQ(computed, false);
EXPECT_EQ(101ul, dummy_timestamp);
EXPECT_EQ(303, dummy_arrival_time_ms);
- EXPECT_EQ(909, dummy_packet_size);
}
static void InternalExpectTrue(InterArrival* inter_arrival,
uint32_t timestamp, int64_t arrival_time_ms,
- size_t packet_size,
uint32_t expected_timestamp_delta,
int64_t expected_arrival_time_delta_ms,
- int expected_packet_size_delta,
uint32_t timestamp_near) {
uint32_t delta_timestamp = 101;
int64_t delta_arrival_time_ms = 303;
- int delta_packet_size = 909;
- bool computed = inter_arrival->ComputeDeltas(timestamp,
- arrival_time_ms,
- packet_size,
- &delta_timestamp,
- &delta_arrival_time_ms,
- &delta_packet_size);
+ bool computed = inter_arrival->ComputeDeltas(
+ timestamp, arrival_time_ms, &delta_timestamp, &delta_arrival_time_ms);
EXPECT_EQ(true, computed);
EXPECT_NEAR(expected_timestamp_delta, delta_timestamp, timestamp_near);
EXPECT_EQ(expected_arrival_time_delta_ms, delta_arrival_time_ms);
- EXPECT_EQ(expected_packet_size_delta, delta_packet_size);
}
rtc::scoped_ptr<InterArrival> inter_arrival_rtp_;
@@ -204,131 +181,124 @@ class InterArrivalTest : public ::testing::Test {
};
TEST_F(InterArrivalTest, FirstPacket) {
- ExpectFalse(0, 17, 1);
+ ExpectFalse(0, 17);
}
TEST_F(InterArrivalTest, FirstGroup) {
// G1
int64_t arrival_time = 17;
int64_t g1_arrival_time = arrival_time;
- ExpectFalse(0, arrival_time, 1);
+ ExpectFalse(0, arrival_time);
// G2
arrival_time += kBurstThresholdMs + 1;
int64_t g2_arrival_time = arrival_time;
- ExpectFalse(kTriggerNewGroupUs, arrival_time, 2);
+ ExpectFalse(kTriggerNewGroupUs, arrival_time);
// G3
// Only once the first packet of the third group arrives, do we see the deltas
// between the first two.
arrival_time += kBurstThresholdMs + 1;
- ExpectTrue(2 * kTriggerNewGroupUs, arrival_time, 1,
+ ExpectTrue(2 * kTriggerNewGroupUs, arrival_time,
// Delta G2-G1
- kTriggerNewGroupUs, g2_arrival_time - g1_arrival_time, 1,
- 0);
+ kTriggerNewGroupUs, g2_arrival_time - g1_arrival_time, 0);
}
TEST_F(InterArrivalTest, SecondGroup) {
// G1
int64_t arrival_time = 17;
int64_t g1_arrival_time = arrival_time;
- ExpectFalse(0, arrival_time, 1);
+ ExpectFalse(0, arrival_time);
// G2
arrival_time += kBurstThresholdMs + 1;
int64_t g2_arrival_time = arrival_time;
- ExpectFalse(kTriggerNewGroupUs, arrival_time, 2);
+ ExpectFalse(kTriggerNewGroupUs, arrival_time);
// G3
arrival_time += kBurstThresholdMs + 1;
int64_t g3_arrival_time = arrival_time;
- ExpectTrue(2 * kTriggerNewGroupUs, arrival_time, 1,
+ ExpectTrue(2 * kTriggerNewGroupUs, arrival_time,
// Delta G2-G1
- kTriggerNewGroupUs, g2_arrival_time - g1_arrival_time, 1,
- 0);
+ kTriggerNewGroupUs, g2_arrival_time - g1_arrival_time, 0);
// G4
// First packet of 4th group yields deltas between group 2 and 3.
arrival_time += kBurstThresholdMs + 1;
- ExpectTrue(3 * kTriggerNewGroupUs, arrival_time, 2,
+ ExpectTrue(3 * kTriggerNewGroupUs, arrival_time,
// Delta G3-G2
- kTriggerNewGroupUs, g3_arrival_time - g2_arrival_time, -1,
- 0);
+ kTriggerNewGroupUs, g3_arrival_time - g2_arrival_time, 0);
}
TEST_F(InterArrivalTest, AccumulatedGroup) {
// G1
int64_t arrival_time = 17;
int64_t g1_arrival_time = arrival_time;
- ExpectFalse(0, arrival_time, 1);
+ ExpectFalse(0, arrival_time);
// G2
arrival_time += kBurstThresholdMs + 1;
- ExpectFalse(kTriggerNewGroupUs, 28, 2);
+ ExpectFalse(kTriggerNewGroupUs, 28);
int64_t timestamp = kTriggerNewGroupUs;
for (int i = 0; i < 10; ++i) {
// A bunch of packets arriving within the same group.
arrival_time += kBurstThresholdMs + 1;
timestamp += kMinStep;
- ExpectFalse(timestamp, arrival_time, 1);
+ ExpectFalse(timestamp, arrival_time);
}
int64_t g2_arrival_time = arrival_time;
int64_t g2_timestamp = timestamp;
// G3
arrival_time = 500;
- ExpectTrue(2 * kTriggerNewGroupUs, arrival_time, 100,
- g2_timestamp, g2_arrival_time - g1_arrival_time,
- (2 + 10) - 1, // Delta G2-G1
- 0);
+ ExpectTrue(2 * kTriggerNewGroupUs, arrival_time, g2_timestamp,
+ g2_arrival_time - g1_arrival_time, 0);
}
TEST_F(InterArrivalTest, OutOfOrderPacket) {
// G1
int64_t arrival_time = 17;
int64_t timestamp = 0;
- ExpectFalse(timestamp, arrival_time, 1);
+ ExpectFalse(timestamp, arrival_time);
int64_t g1_timestamp = timestamp;
int64_t g1_arrival_time = arrival_time;
// G2
arrival_time += 11;
timestamp += kTriggerNewGroupUs;
- ExpectFalse(timestamp, 28, 2);
+ ExpectFalse(timestamp, 28);
for (int i = 0; i < 10; ++i) {
arrival_time += kBurstThresholdMs + 1;
timestamp += kMinStep;
- ExpectFalse(timestamp, arrival_time, 1);
+ ExpectFalse(timestamp, arrival_time);
}
int64_t g2_timestamp = timestamp;
int64_t g2_arrival_time = arrival_time;
// This packet is out of order and should be dropped.
arrival_time = 281;
- ExpectFalse(g1_timestamp, arrival_time, 100);
+ ExpectFalse(g1_timestamp, arrival_time);
// G3
arrival_time = 500;
timestamp = 2 * kTriggerNewGroupUs;
- ExpectTrue(timestamp, arrival_time, 100,
+ ExpectTrue(timestamp, arrival_time,
// Delta G2-G1
- g2_timestamp - g1_timestamp, g2_arrival_time - g1_arrival_time,
- (2 + 10) - 1,
- 0);
+ g2_timestamp - g1_timestamp, g2_arrival_time - g1_arrival_time, 0);
}
TEST_F(InterArrivalTest, OutOfOrderWithinGroup) {
// G1
int64_t arrival_time = 17;
int64_t timestamp = 0;
- ExpectFalse(timestamp, arrival_time, 1);
+ ExpectFalse(timestamp, arrival_time);
int64_t g1_timestamp = timestamp;
int64_t g1_arrival_time = arrival_time;
// G2
timestamp += kTriggerNewGroupUs;
arrival_time += 11;
- ExpectFalse(kTriggerNewGroupUs, 28, 2);
+ ExpectFalse(kTriggerNewGroupUs, 28);
timestamp += 10 * kMinStep;
int64_t g2_timestamp = timestamp;
for (int i = 0; i < 10; ++i) {
@@ -336,7 +306,7 @@ TEST_F(InterArrivalTest, OutOfOrderWithinGroup) {
// nevertheless accumulated to group because their timestamps are higher
// than the initial timestamp of the group.
arrival_time += kBurstThresholdMs + 1;
- ExpectFalse(timestamp, arrival_time, 1);
+ ExpectFalse(timestamp, arrival_time);
timestamp -= kMinStep;
}
int64_t g2_arrival_time = arrival_time;
@@ -344,21 +314,19 @@ TEST_F(InterArrivalTest, OutOfOrderWithinGroup) {
// However, this packet is deemed out of order and should be dropped.
arrival_time = 281;
timestamp = g1_timestamp;
- ExpectFalse(timestamp, arrival_time, 100);
+ ExpectFalse(timestamp, arrival_time);
// G3
timestamp = 2 * kTriggerNewGroupUs;
arrival_time = 500;
- ExpectTrue(timestamp, arrival_time, 100,
- g2_timestamp - g1_timestamp, g2_arrival_time - g1_arrival_time,
- (2 + 10) - 1,
- 0);
+ ExpectTrue(timestamp, arrival_time, g2_timestamp - g1_timestamp,
+ g2_arrival_time - g1_arrival_time, 0);
}
TEST_F(InterArrivalTest, TwoBursts) {
// G1
int64_t g1_arrival_time = 17;
- ExpectFalse(0, g1_arrival_time, 1);
+ ExpectFalse(0, g1_arrival_time);
// G2
int64_t timestamp = kTriggerNewGroupUs;
@@ -367,7 +335,7 @@ TEST_F(InterArrivalTest, TwoBursts) {
// A bunch of packets arriving in one burst (within 5 ms apart).
timestamp += 30000;
arrival_time += kBurstThresholdMs;
- ExpectFalse(timestamp, arrival_time, 1);
+ ExpectFalse(timestamp, arrival_time);
}
int64_t g2_arrival_time = arrival_time;
int64_t g2_timestamp = timestamp;
@@ -375,27 +343,23 @@ TEST_F(InterArrivalTest, TwoBursts) {
// G3
timestamp += 30000;
arrival_time += kBurstThresholdMs + 1;
- ExpectTrue(timestamp, arrival_time, 100,
- g2_timestamp, g2_arrival_time - g1_arrival_time,
- 10 - 1, // Delta G2-G1
- 0);
+ ExpectTrue(timestamp, arrival_time, g2_timestamp,
+ g2_arrival_time - g1_arrival_time, 0);
}
TEST_F(InterArrivalTest, NoBursts) {
// G1
- ExpectFalse(0, 17, 1);
+ ExpectFalse(0, 17);
// G2
int64_t timestamp = kTriggerNewGroupUs;
int64_t arrival_time = 28;
- ExpectFalse(timestamp, arrival_time, 2);
+ ExpectFalse(timestamp, arrival_time);
// G3
ExpectTrue(kTriggerNewGroupUs + 30000, arrival_time + kBurstThresholdMs + 1,
- 100, timestamp - 0, arrival_time - 17,
- 2 - 1, // Delta G2-G1
- 0);
+ timestamp - 0, arrival_time - 17, 0);
}
// Yields 0xfffffffe when converted to internal representation in
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/inter_arrival.cc ('k') | webrtc/modules/remote_bitrate_estimator/overuse_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698