mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
UTest: Fix utest warnings.
This commit is contained in:
parent
cfbbe3044f
commit
9c81a0e1bd
8 changed files with 603 additions and 560 deletions
|
@ -765,7 +765,7 @@ VOID TEST(KernelRTCTest, NACKEncode)
|
|||
vector<uint16_t> before = rtcp_nack_encode.get_lost_sns();
|
||||
vector<uint16_t> after = rtcp_nack_decode.get_lost_sns();
|
||||
EXPECT_TRUE(before.size() == after.size());
|
||||
for(int i = 0; i < before.size() && i < after.size(); ++i) {
|
||||
for(int i = 0; i < (int)before.size() && i < (int)after.size(); ++i) {
|
||||
EXPECT_TRUE(before.at(i) == after.at(i));
|
||||
}
|
||||
}
|
||||
|
@ -932,11 +932,11 @@ VOID TEST(KernelRTCTest, Ntp)
|
|||
// Cover systime to ntp
|
||||
SrsNtp ntp = SrsNtp::from_time_ms(now_ms);
|
||||
|
||||
ASSERT_EQ(ntp.system_ms_, now_ms);
|
||||
ASSERT_EQ((srs_utime_t)ntp.system_ms_, now_ms);
|
||||
|
||||
// Cover ntp to systime
|
||||
SrsNtp ntp1 = SrsNtp::to_time_ms(ntp.ntp_);
|
||||
ASSERT_EQ(ntp1.system_ms_, now_ms);
|
||||
ASSERT_EQ((srs_utime_t)ntp1.system_ms_, now_ms);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -945,10 +945,10 @@ VOID TEST(KernelRTCTest, Ntp)
|
|||
srs_utime_t now_ms = srs_get_system_time() / 1000;
|
||||
SrsNtp ntp = SrsNtp::from_time_ms(now_ms);
|
||||
|
||||
ASSERT_EQ(ntp.system_ms_, now_ms);
|
||||
ASSERT_EQ((srs_utime_t)ntp.system_ms_, now_ms);
|
||||
|
||||
SrsNtp ntp1 = SrsNtp::to_time_ms(ntp.ntp_);
|
||||
ASSERT_EQ(ntp1.system_ms_, now_ms);
|
||||
ASSERT_EQ((srs_utime_t)ntp1.system_ms_, now_ms);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1279,46 +1279,46 @@ VOID TEST(KernelRTCTest, JitterTimestamp)
|
|||
SrsRtcTsJitter jitter(1000);
|
||||
|
||||
// Starts from the base.
|
||||
EXPECT_EQ(1000, jitter.correct(0));
|
||||
EXPECT_EQ((uint32_t)1000, jitter.correct(0));
|
||||
|
||||
// Start from here.
|
||||
EXPECT_EQ(1010, jitter.correct(10));
|
||||
EXPECT_EQ(1010, jitter.correct(10));
|
||||
EXPECT_EQ(1020, jitter.correct(20));
|
||||
EXPECT_EQ((uint32_t)1010, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)1010, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)1020, jitter.correct(20));
|
||||
|
||||
// Reset the base for jitter detected.
|
||||
EXPECT_EQ(1020, jitter.correct(20 + 90*3*1000 + 1));
|
||||
EXPECT_EQ(1019, jitter.correct(20 + 90*3*1000));
|
||||
EXPECT_EQ(1021, jitter.correct(20 + 90*3*1000 + 2));
|
||||
EXPECT_EQ(1019, jitter.correct(20 + 90*3*1000));
|
||||
EXPECT_EQ(1020, jitter.correct(20 + 90*3*1000 + 1));
|
||||
EXPECT_EQ((uint32_t)1020, jitter.correct(20 + 90*3*1000 + 1));
|
||||
EXPECT_EQ((uint32_t)1019, jitter.correct(20 + 90*3*1000));
|
||||
EXPECT_EQ((uint32_t)1021, jitter.correct(20 + 90*3*1000 + 2));
|
||||
EXPECT_EQ((uint32_t)1019, jitter.correct(20 + 90*3*1000));
|
||||
EXPECT_EQ((uint32_t)1020, jitter.correct(20 + 90*3*1000 + 1));
|
||||
|
||||
// Rollback the timestamp.
|
||||
EXPECT_EQ(1020, jitter.correct(20));
|
||||
EXPECT_EQ(1021, jitter.correct(20 + 1));
|
||||
EXPECT_EQ(1021, jitter.correct(21));
|
||||
EXPECT_EQ((uint32_t)1020, jitter.correct(20));
|
||||
EXPECT_EQ((uint32_t)1021, jitter.correct(20 + 1));
|
||||
EXPECT_EQ((uint32_t)1021, jitter.correct(21));
|
||||
|
||||
// Reset for jitter again.
|
||||
EXPECT_EQ(1021, jitter.correct(21 + 90*3*1000 + 1));
|
||||
EXPECT_EQ(1021, jitter.correct(21));
|
||||
EXPECT_EQ((uint32_t)1021, jitter.correct(21 + 90*3*1000 + 1));
|
||||
EXPECT_EQ((uint32_t)1021, jitter.correct(21));
|
||||
|
||||
// No jitter at edge.
|
||||
EXPECT_EQ(1021 + 90*3*1000, jitter.correct(21 + 90*3*1000));
|
||||
EXPECT_EQ(1021 + 90*3*1000 + 1, jitter.correct(21 + 90*3*1000 + 1));
|
||||
EXPECT_EQ(1021 + 1, jitter.correct(21 + 1));
|
||||
EXPECT_EQ((uint32_t)(1021 + 90*3*1000), jitter.correct(21 + 90*3*1000));
|
||||
EXPECT_EQ((uint32_t)(1021 + 90*3*1000 + 1), jitter.correct(21 + 90*3*1000 + 1));
|
||||
EXPECT_EQ((uint32_t)(1021 + 1), jitter.correct(21 + 1));
|
||||
|
||||
// Also safety to decrease the value.
|
||||
EXPECT_EQ(1021, jitter.correct(21));
|
||||
EXPECT_EQ(1010, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)1021, jitter.correct(21));
|
||||
EXPECT_EQ((uint32_t)1010, jitter.correct(10));
|
||||
|
||||
// Try to reset to 0 base.
|
||||
EXPECT_EQ(1010, jitter.correct(10 + 90*3*1000 + 1010));
|
||||
EXPECT_EQ(0, jitter.correct(10 + 90*3*1000));
|
||||
EXPECT_EQ(0, jitter.correct(0));
|
||||
EXPECT_EQ((uint32_t)1010, jitter.correct(10 + 90*3*1000 + 1010));
|
||||
EXPECT_EQ((uint32_t)0, jitter.correct(10 + 90*3*1000));
|
||||
EXPECT_EQ((uint32_t)0, jitter.correct(0));
|
||||
|
||||
// Also safety to start from zero.
|
||||
EXPECT_EQ(10, jitter.correct(10));
|
||||
EXPECT_EQ(11, jitter.correct(11));
|
||||
EXPECT_EQ((uint32_t)10, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)11, jitter.correct(11));
|
||||
}
|
||||
|
||||
VOID TEST(KernelRTCTest, JitterSequence)
|
||||
|
@ -1326,45 +1326,45 @@ VOID TEST(KernelRTCTest, JitterSequence)
|
|||
SrsRtcSeqJitter jitter(100);
|
||||
|
||||
// Starts from the base.
|
||||
EXPECT_EQ(100, jitter.correct(0));
|
||||
EXPECT_EQ((uint32_t)100, jitter.correct(0));
|
||||
|
||||
// Normal without jitter.
|
||||
EXPECT_EQ(101, jitter.correct(1));
|
||||
EXPECT_EQ(102, jitter.correct(2));
|
||||
EXPECT_EQ(101, jitter.correct(1));
|
||||
EXPECT_EQ(103, jitter.correct(3));
|
||||
EXPECT_EQ(110, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)101, jitter.correct(1));
|
||||
EXPECT_EQ((uint32_t)102, jitter.correct(2));
|
||||
EXPECT_EQ((uint32_t)101, jitter.correct(1));
|
||||
EXPECT_EQ((uint32_t)103, jitter.correct(3));
|
||||
EXPECT_EQ((uint32_t)110, jitter.correct(10));
|
||||
|
||||
// Reset the base for jitter detected.
|
||||
EXPECT_EQ(110, jitter.correct(10 + 128 + 1));
|
||||
EXPECT_EQ(109, jitter.correct(10 + 128));
|
||||
EXPECT_EQ(110, jitter.correct(10 + 128 + 1));
|
||||
EXPECT_EQ((uint32_t)110, jitter.correct(10 + 128 + 1));
|
||||
EXPECT_EQ((uint32_t)109, jitter.correct(10 + 128));
|
||||
EXPECT_EQ((uint32_t)110, jitter.correct(10 + 128 + 1));
|
||||
|
||||
// Rollback the timestamp.
|
||||
EXPECT_EQ(110, jitter.correct(10));
|
||||
EXPECT_EQ(111, jitter.correct(10 + 1));
|
||||
EXPECT_EQ(111, jitter.correct(11));
|
||||
EXPECT_EQ((uint32_t)110, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)111, jitter.correct(10 + 1));
|
||||
EXPECT_EQ((uint32_t)111, jitter.correct(11));
|
||||
|
||||
// Reset for jitter again.
|
||||
EXPECT_EQ(111, jitter.correct(11 + 128 + 1));
|
||||
EXPECT_EQ(111, jitter.correct(11));
|
||||
EXPECT_EQ((uint32_t)111, jitter.correct(11 + 128 + 1));
|
||||
EXPECT_EQ((uint32_t)111, jitter.correct(11));
|
||||
|
||||
// No jitter at edge.
|
||||
EXPECT_EQ(111 + 128, jitter.correct(11 + 128));
|
||||
EXPECT_EQ(111 + 128 + 1, jitter.correct(11 + 128 + 1));
|
||||
EXPECT_EQ(111 + 1, jitter.correct(11 + 1));
|
||||
EXPECT_EQ((uint32_t)(111 + 128), jitter.correct(11 + 128));
|
||||
EXPECT_EQ((uint32_t)(111 + 128 + 1), jitter.correct(11 + 128 + 1));
|
||||
EXPECT_EQ((uint32_t)(111 + 1), jitter.correct(11 + 1));
|
||||
|
||||
// Also safety to decrease the value.
|
||||
EXPECT_EQ(111, jitter.correct(11));
|
||||
EXPECT_EQ(110, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)111, jitter.correct(11));
|
||||
EXPECT_EQ((uint32_t)110, jitter.correct(10));
|
||||
|
||||
// Try to reset to 0 base.
|
||||
EXPECT_EQ(110, jitter.correct(10 + 128 + 110));
|
||||
EXPECT_EQ(0, jitter.correct(10 + 128));
|
||||
EXPECT_EQ(0, jitter.correct(0));
|
||||
EXPECT_EQ((uint32_t)110, jitter.correct(10 + 128 + 110));
|
||||
EXPECT_EQ((uint32_t)0, jitter.correct(10 + 128));
|
||||
EXPECT_EQ((uint32_t)0, jitter.correct(0));
|
||||
|
||||
// Also safety to start from zero.
|
||||
EXPECT_EQ(10, jitter.correct(10));
|
||||
EXPECT_EQ(11, jitter.correct(11));
|
||||
EXPECT_EQ((uint32_t)10, jitter.correct(10));
|
||||
EXPECT_EQ((uint32_t)11, jitter.correct(11));
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue