zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "In bitrate estimator Improve handing send time of out of order packets"

Browse Source 
This reverts commit 2295ddbff978b9954688ee6163c9f3f554a7a85e.

Reason for revert: Investigation required because it breaks some downstream tests.

Original change's description:
> In bitrate estimator Improve handing send time of out of order packets
>
> Bug: None
> Change-Id: I74da3b616fb9419de8f7d9d28326354cee1c178d
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268061
> Reviewed-by: Philip Eliasson <philipel@webrtc.org>
> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#37494}

Bug: None
Change-Id: Ib8ab916b9eedb93aac5fc35c5d291b1f4ed16de0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268541
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37520}
This commit is contained in:
Mirko Bonadei
2022-07-14 09:53:43 +00:00
committed by WebRTC LUCI CQ
parent ffd2241eda
commit 9dcbfd8614
2 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/remote_bitrate_estimator/remote_estimator_proxy.cc
View File

@ -140,15 +140,9 @@ void RemoteEstimatorProxy::IncomingPacket(Packet packet) {
if (network_state_estimator_ && packet.absolute_send_time_24bits) {
PacketResult packet_result;
packet_result.receive_time = packet.arrival_time;
TimeDelta delta = GetAbsoluteSendTimeDelta(
abs_send_timestamp_ += GetAbsoluteSendTimeDelta(
*packet.absolute_send_time_24bits, previous_abs_send_time_);
// `GetAbsoluteSendTimeDelta` returns zero when packet arrived out of order.
// Don't adjust previous_abs_send_time, otherwise abs_send_timestamp_ would
// accumulate error.
if (delta > TimeDelta::Zero()) {
abs_send_timestamp_ += delta;
previous_abs_send_time_ = *packet.absolute_send_time_24bits;
}
previous_abs_send_time_ = *packet.absolute_send_time_24bits;
packet_result.sent_packet.send_time = abs_send_timestamp_;
packet_result.sent_packet.size = packet.size + packet_overhead_;
packet_result.sent_packet.sequence_number = seq;

45
modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
View File

@ -631,51 +631,6 @@ TEST_F(RemoteEstimatorProxyTest, IncomingPacketHandlesWrapInAbsSendTime) {
.transport_sequence_number = kBaseSeq + 1});
}
TEST_F(RemoteEstimatorProxyTest, OutOfOrderPacketReportsWithSameSendTime) {
// abs send time use 24bit precision.
const uint32_t kFirstAbsSendTime =
AbsoluteSendTime::To24Bits(Timestamp::Millis(15));
// Second abs send time has wrapped.
const uint32_t kSecondAbsSendTime =
AbsoluteSendTime::To24Bits(Timestamp::Millis(30));
const uint32_t kThirdAbsSendTime =
AbsoluteSendTime::To24Bits(Timestamp::Millis(45));
Timestamp first_send_timestamp = Timestamp::Zero();
EXPECT_CALL(network_state_estimator_, OnReceivedPacket)
.WillOnce([&](const PacketResult& packet) {
first_send_timestamp = packet.sent_packet.send_time;
})
.WillOnce([&](const PacketResult& packet) {
// Expect out of order packet repeats previous timestamp.
EXPECT_EQ(packet.sent_packet.send_time, first_send_timestamp);
})
.WillOnce([&](const PacketResult& packet) {
// Expect 2nd arrived packet doesn't affect difference in absolute send
// time between 3rd and 1st packets.
// Round to milliseconds precision to compensate for precision loss due
// to convertion to/from 6x18 format of the absolute send time.
EXPECT_EQ((packet.sent_packet.send_time - first_send_timestamp).ms(),
15);
});
proxy_.IncomingPacket({.arrival_time = kBaseTime,
.size = kDefaultPacketSize,
.ssrc = kMediaSsrc,
.absolute_send_time_24bits = kSecondAbsSendTime,
.transport_sequence_number = kBaseSeq + 2});
proxy_.IncomingPacket({.arrival_time = kBaseTime + TimeDelta::Millis(10),
.size = kDefaultPacketSize,
.ssrc = kMediaSsrc,
.absolute_send_time_24bits = kFirstAbsSendTime,
.transport_sequence_number = kBaseSeq + 1});
proxy_.IncomingPacket({.arrival_time = kBaseTime + TimeDelta::Millis(20),
.size = kDefaultPacketSize,
.ssrc = kMediaSsrc,
.absolute_send_time_24bits = kThirdAbsSendTime,
.transport_sequence_number = kBaseSeq + 3});
}
TEST_F(RemoteEstimatorProxyTest, SendTransportFeedbackAndNetworkStateUpdate) {
proxy_.IncomingPacket(
{.arrival_time = kBaseTime,