Use Timestamp to represent packet receive timestamps
Before this CL, timestamps of received packets were rounded to the nearest millisecond and stored as int64_t. Due to the rounding it sometimes happened that timestamps later in the pipeline that are not rounded seem to occur even before the video frame was received. Change-Id: I92d8f3540b23baae2d4a1dc6a7cb3f58bcdaad18 Bug: webrtc:12722 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/216398 Reviewed-by: Chen Xing <chxg@google.com> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Johannes Kron <kron@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33916}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
c27c047e3e
commit
f7de74c58c
@ -497,7 +497,7 @@ TEST_F(NetEqImplTest, VerifyTimestampPropagation) {
|
||||
|
||||
// Insert one packet.
|
||||
clock_.AdvanceTimeMilliseconds(123456);
|
||||
int64_t expected_receive_time_ms = clock_.TimeInMilliseconds();
|
||||
Timestamp expected_receive_time = clock_.CurrentTime();
|
||||
EXPECT_EQ(NetEq::kOK, neteq_->InsertPacket(rtp_header, payload));
|
||||
|
||||
// Pull audio once.
|
||||
@ -518,7 +518,7 @@ TEST_F(NetEqImplTest, VerifyTimestampPropagation) {
|
||||
EXPECT_THAT(packet_info.csrcs(), ElementsAre(43, 65, 17));
|
||||
EXPECT_EQ(packet_info.rtp_timestamp(), rtp_header.timestamp);
|
||||
EXPECT_FALSE(packet_info.audio_level().has_value());
|
||||
EXPECT_EQ(packet_info.receive_time_ms(), expected_receive_time_ms);
|
||||
EXPECT_EQ(packet_info.receive_time(), expected_receive_time);
|
||||
}
|
||||
|
||||
// Start with a simple check that the fake decoder is behaving as expected.
|
||||
@ -590,7 +590,7 @@ TEST_F(NetEqImplTest, ReorderedPacket) {
|
||||
|
||||
// Insert one packet.
|
||||
clock_.AdvanceTimeMilliseconds(123456);
|
||||
int64_t expected_receive_time_ms = clock_.TimeInMilliseconds();
|
||||
Timestamp expected_receive_time = clock_.CurrentTime();
|
||||
EXPECT_EQ(NetEq::kOK, neteq_->InsertPacket(rtp_header, payload));
|
||||
|
||||
// Pull audio once.
|
||||
@ -610,7 +610,7 @@ TEST_F(NetEqImplTest, ReorderedPacket) {
|
||||
EXPECT_THAT(packet_info.csrcs(), IsEmpty());
|
||||
EXPECT_EQ(packet_info.rtp_timestamp(), rtp_header.timestamp);
|
||||
EXPECT_EQ(packet_info.audio_level(), rtp_header.extension.audioLevel);
|
||||
EXPECT_EQ(packet_info.receive_time_ms(), expected_receive_time_ms);
|
||||
EXPECT_EQ(packet_info.receive_time(), expected_receive_time);
|
||||
}
|
||||
|
||||
// Insert two more packets. The first one is out of order, and is already too
|
||||
@ -626,7 +626,7 @@ TEST_F(NetEqImplTest, ReorderedPacket) {
|
||||
rtp_header.extension.audioLevel = 2;
|
||||
payload[0] = 2;
|
||||
clock_.AdvanceTimeMilliseconds(2000);
|
||||
expected_receive_time_ms = clock_.TimeInMilliseconds();
|
||||
expected_receive_time = clock_.CurrentTime();
|
||||
EXPECT_EQ(NetEq::kOK, neteq_->InsertPacket(rtp_header, payload));
|
||||
|
||||
// Expect only the second packet to be decoded (the one with "2" as the first
|
||||
@ -656,7 +656,7 @@ TEST_F(NetEqImplTest, ReorderedPacket) {
|
||||
EXPECT_THAT(packet_info.csrcs(), IsEmpty());
|
||||
EXPECT_EQ(packet_info.rtp_timestamp(), rtp_header.timestamp);
|
||||
EXPECT_EQ(packet_info.audio_level(), rtp_header.extension.audioLevel);
|
||||
EXPECT_EQ(packet_info.receive_time_ms(), expected_receive_time_ms);
|
||||
EXPECT_EQ(packet_info.receive_time(), expected_receive_time);
|
||||
}
|
||||
|
||||
EXPECT_CALL(mock_decoder, Die());
|
||||
|
||||
Reference in New Issue
Block a user