Only store sequence numbers for media stream in FlexFEC end-to-end test.
This should remove the test flakiness, as before this change there
could be collisions from sequence numbers coming from two sequence
number spaces (the media SSRC and the FlexFEC SSRC). The probability
of collisions was low, and hence the flakes were far between.
This change also reduces the packet loss to 5% (down from ~50%), in
order for the BWE to have an easier time to ramp up.
BUG=webrtc:6825
R=philipel@webrtc.org, mflodman@webrtc.org
Review-Url: https://codereview.webrtc.org/2554403003
Cr-Original-Commit-Position: refs/heads/master@{#15512}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 3536463e7e808747ddc5da2dc0933dbec97ceeeb
diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc
index 99f951d..5c16ef2 100644
--- a/video/end_to_end_tests.cc
+++ b/video/end_to_end_tests.cc
@@ -19,6 +19,7 @@
#include "webrtc/base/event.h"
#include "webrtc/base/file.h"
#include "webrtc/base/optional.h"
+#include "webrtc/base/random.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/call/call.h"
#include "webrtc/common_video/include/frame_callback.h"
@@ -708,7 +709,7 @@
public rtc::VideoSinkInterface<VideoFrame> {
public:
FlexfecRenderObserver()
- : EndToEndTest(kDefaultTimeoutMs), state_(kFirstPacket) {}
+ : EndToEndTest(kDefaultTimeoutMs), random_(0xcafef00d1) {}
size_t GetNumFlexfecStreams() const override { return 1; }
@@ -723,36 +724,30 @@
EXPECT_EQ(kFlexfecPayloadType, payload_type);
}
- auto seq_num_it = protected_sequence_numbers_.find(header.sequenceNumber);
- if (seq_num_it != protected_sequence_numbers_.end()) {
- // Retransmitted packet, should not count.
- protected_sequence_numbers_.erase(seq_num_it);
- auto ts_it = protected_timestamps_.find(header.timestamp);
- EXPECT_NE(ts_it, protected_timestamps_.end());
- protected_timestamps_.erase(ts_it);
- return SEND_PACKET;
+ // Is this a retransmitted media packet? From the perspective of FEC, this
+ // packet is then no longer dropped, so remove it from the list of
+ // dropped packets.
+ if (payload_type == kFakeVideoSendPayloadType) {
+ auto seq_num_it = dropped_sequence_numbers_.find(header.sequenceNumber);
+ if (seq_num_it != dropped_sequence_numbers_.end()) {
+ dropped_sequence_numbers_.erase(seq_num_it);
+ auto ts_it = dropped_timestamps_.find(header.timestamp);
+ EXPECT_NE(ts_it, dropped_timestamps_.end());
+ dropped_timestamps_.erase(ts_it);
+
+ return SEND_PACKET;
+ }
}
- switch (state_) {
- case kFirstPacket:
- state_ = kDropEveryOtherPacketUntilFlexfec;
- break;
- case kDropEveryOtherPacketUntilFlexfec:
- if (payload_type == kFlexfecPayloadType) {
- state_ = kDropNextMediaPacket;
- return SEND_PACKET;
- }
- if (header.sequenceNumber % 2 == 0)
- return DROP_PACKET;
- break;
- case kDropNextMediaPacket:
- if (payload_type == kFakeVideoSendPayloadType) {
- protected_sequence_numbers_.insert(header.sequenceNumber);
- protected_timestamps_.insert(header.timestamp);
- state_ = kDropEveryOtherPacketUntilFlexfec;
- return DROP_PACKET;
- }
- break;
+ // Simulate 5% packet loss. Record what media packets, and corresponding
+ // timestamps, that were dropped.
+ if (random_.Rand(1, 100) <= 5) {
+ if (payload_type == kFakeVideoSendPayloadType) {
+ dropped_sequence_numbers_.insert(header.sequenceNumber);
+ dropped_timestamps_.insert(header.timestamp);
+ }
+
+ return DROP_PACKET;
}
return SEND_PACKET;
@@ -762,17 +757,11 @@
rtc::CritScope lock(&crit_);
// Rendering frame with timestamp of packet that was dropped -> FEC
// protection worked.
- auto it = protected_timestamps_.find(video_frame.timestamp());
- if (it != protected_timestamps_.end())
+ auto it = dropped_timestamps_.find(video_frame.timestamp());
+ if (it != dropped_timestamps_.end())
observation_complete_.Set();
}
- enum {
- kFirstPacket,
- kDropEveryOtherPacketUntilFlexfec,
- kDropNextMediaPacket,
- } state_;
-
void ModifyVideoConfigs(
VideoSendStream::Config* send_config,
std::vector<VideoReceiveStream::Config>* receive_configs,
@@ -786,10 +775,11 @@
}
rtc::CriticalSection crit_;
- std::set<uint32_t> protected_sequence_numbers_ GUARDED_BY(crit_);
+ std::set<uint32_t> dropped_sequence_numbers_ GUARDED_BY(crit_);
// Since several packets can have the same timestamp a multiset is used
// instead of a set.
- std::multiset<uint32_t> protected_timestamps_ GUARDED_BY(crit_);
+ std::multiset<uint32_t> dropped_timestamps_ GUARDED_BY(crit_);
+ Random random_;
} test;
RunBaseTest(&test);
