admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove test workaround to catch scenario when packet is resent before sent

Browse Source 
Bug: webrtc:5540, webrtc:10198
Change-Id: I408b471cbd14c12bdb98606999807cc7f2b56c3f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/289100
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39134}
This commit is contained in:
Danil Chapovalov 2022-12-23 17:06:27 +00:00 committed by WebRTC LUCI CQ
parent 4ccb616fa2
commit 4885de46ef
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
video/end_to_end_tests/retransmission_tests.cc
View File

@ -407,18 +407,6 @@ void RetransmissionEndToEndTest::DecodesRetransmittedFrame(bool enable_rtx,
// This should be the only dropped packet. // This should be the only dropped packet.
EXPECT_EQ(0u, retransmitted_timestamp_); EXPECT_EQ(0u, retransmitted_timestamp_);
retransmitted_timestamp_ = rtp_packet.Timestamp(); retransmitted_timestamp_ = rtp_packet.Timestamp();
if (absl::c_linear_search(rendered_timestamps_,
retransmitted_timestamp_)) {
// Frame was rendered before last packet was scheduled for sending.
// This is extremly rare but possible scenario because prober able to
// resend packet before it was send.
// TODO(danilchap): Remove this corner case when prober would not be
// able to sneak in between packet saved to history for resending and
// pacer notified about existance of that packet for sending.
// See https://bugs.chromium.org/p/webrtc/issues/detail?id=5540 for
// details.
observation_complete_.Set();
}
return DROP_PACKET; return DROP_PACKET;
} }
@ -431,7 +419,6 @@ void RetransmissionEndToEndTest::DecodesRetransmittedFrame(bool enable_rtx,
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (frame.timestamp() == retransmitted_timestamp_) if (frame.timestamp() == retransmitted_timestamp_)
observation_complete_.Set(); observation_complete_.Set();
rendered_timestamps_.push_back(frame.timestamp());
} }
orig_renderer_->OnFrame(frame); orig_renderer_->OnFrame(frame);
} }
@ -512,7 +499,6 @@ void RetransmissionEndToEndTest::DecodesRetransmittedFrame(bool enable_rtx,
const std::string payload_name_; const std::string payload_name_;
int marker_bits_observed_; int marker_bits_observed_;
uint32_t retransmitted_timestamp_ RTC_GUARDED_BY(&mutex_); uint32_t retransmitted_timestamp_ RTC_GUARDED_BY(&mutex_);
std::vector<uint32_t> rendered_timestamps_ RTC_GUARDED_BY(&mutex_);
} test(enable_rtx, enable_red); } test(enable_rtx, enable_red);
RunBaseTest(&test); RunBaseTest(&test);