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

Remove sequence_number from RtpPacketInfo.

Browse Source 
This change removes sequence_number from RtpPacketInfo since it's currently not used.

Bug: webrtc:10668
Change-Id: I9b45c7476457df1d18173f37c421374108678931
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141873
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Chen Xing <chxg@google.com>
Cr-Commit-Position: refs/heads/master@{#28281}
This commit is contained in:
Chen Xing
2019-06-13 20:36:12 +02:00
committed by Commit Bot
parent ad82e8e1a6
commit 12d64deb6c
5 changed files with 40 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
modules/rtp_rtcp/source/source_tracker_unittest.cc
View File

@ -108,7 +108,6 @@ class SourceTrackerRandomTest
RtpPacketInfos::vector_type packet_infos;
for (size_t i = 0; i < count; ++i) {
packet_infos.emplace_back(GenerateSsrc(), GenerateCsrcs(),
GenerateSequenceNumber(),
GenerateRtpTimestamp(), GenerateAudioLevel(),
GenerateReceiveTimeMs());
}
@ -157,10 +156,6 @@ class SourceTrackerRandomTest
return csrcs;
}
uint16_t GenerateSequenceNumber() {
return std::uniform_int_distribution<uint16_t>()(generator_);
}
uint32_t GenerateRtpTimestamp() {
return std::uniform_int_distribution<uint32_t>()(generator_);
}
@ -224,8 +219,8 @@ TEST(SourceTrackerTest, StartEmpty) {
TEST(SourceTrackerTest, OnFrameDeliveredRecordsSources) {
constexpr uint32_t kSsrc = 10;
constexpr uint32_t kCsrcs[] = {20, 21};
constexpr uint16_t kSequenceNumber = 30;
constexpr uint32_t kCsrcs0 = 20;
constexpr uint32_t kCsrcs1 = 21;
constexpr uint32_t kRtpTimestamp = 40;
constexpr absl::optional<uint8_t> kAudioLevel = 50;
constexpr int64_t kReceiveTimeMs = 60;
@ -233,20 +228,18 @@ TEST(SourceTrackerTest, OnFrameDeliveredRecordsSources) {
SimulatedClock clock(1000000000000ULL);
SourceTracker tracker(&clock);
tracker.OnFrameDelivered(RtpPacketInfos(
{RtpPacketInfo(kSsrc, {kCsrcs[0], kCsrcs[1]}, kSequenceNumber,
kRtpTimestamp, kAudioLevel, kReceiveTimeMs)}));
tracker.OnFrameDelivered(RtpPacketInfos({RtpPacketInfo(
kSsrc, {kCsrcs0, kCsrcs1}, kRtpTimestamp, kAudioLevel, kReceiveTimeMs)}));
int64_t timestamp_ms = clock.TimeInMilliseconds();
EXPECT_THAT(
tracker.GetSources(),
ElementsAre(RtpSource(timestamp_ms, kSsrc, RtpSourceType::SSRC,
kAudioLevel, kRtpTimestamp),
RtpSource(timestamp_ms, kCsrcs[1], RtpSourceType::CSRC,
kAudioLevel, kRtpTimestamp),
RtpSource(timestamp_ms, kCsrcs[0], RtpSourceType::CSRC,
kAudioLevel, kRtpTimestamp)));
EXPECT_THAT(tracker.GetSources(),
ElementsAre(RtpSource(timestamp_ms, kSsrc, RtpSourceType::SSRC,
kAudioLevel, kRtpTimestamp),
RtpSource(timestamp_ms, kCsrcs1, RtpSourceType::CSRC,
kAudioLevel, kRtpTimestamp),
RtpSource(timestamp_ms, kCsrcs0, RtpSourceType::CSRC,
kAudioLevel, kRtpTimestamp)));
}
TEST(SourceTrackerTest, OnFrameDeliveredUpdatesSources) {
@ -254,8 +247,6 @@ TEST(SourceTrackerTest, OnFrameDeliveredUpdatesSources) {
constexpr uint32_t kCsrcs0 = 20;
constexpr uint32_t kCsrcs1 = 21;
constexpr uint32_t kCsrcs2 = 22;
constexpr uint16_t kSequenceNumber0 = 30;
constexpr uint16_t kSequenceNumber1 = 31;
constexpr uint32_t kRtpTimestamp0 = 40;
constexpr uint32_t kRtpTimestamp1 = 41;
constexpr absl::optional<uint8_t> kAudioLevel0 = 50;
@ -266,17 +257,17 @@ TEST(SourceTrackerTest, OnFrameDeliveredUpdatesSources) {
SimulatedClock clock(1000000000000ULL);
SourceTracker tracker(&clock);
tracker.OnFrameDelivered(RtpPacketInfos(
{RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs1}, kSequenceNumber0,
kRtpTimestamp0, kAudioLevel0, kReceiveTimeMs0)}));
tracker.OnFrameDelivered(
RtpPacketInfos({RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs1}, kRtpTimestamp0,
kAudioLevel0, kReceiveTimeMs0)}));
int64_t timestamp_ms_0 = clock.TimeInMilliseconds();
clock.AdvanceTimeMilliseconds(17);
tracker.OnFrameDelivered(RtpPacketInfos(
{RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs2}, kSequenceNumber1,
kRtpTimestamp1, kAudioLevel1, kReceiveTimeMs1)}));
tracker.OnFrameDelivered(
RtpPacketInfos({RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs2}, kRtpTimestamp1,
kAudioLevel1, kReceiveTimeMs1)}));
int64_t timestamp_ms_1 = clock.TimeInMilliseconds();
@ -297,8 +288,6 @@ TEST(SourceTrackerTest, TimedOutSourcesAreRemoved) {
constexpr uint32_t kCsrcs0 = 20;
constexpr uint32_t kCsrcs1 = 21;
constexpr uint32_t kCsrcs2 = 22;
constexpr uint16_t kSequenceNumber0 = 30;
constexpr uint16_t kSequenceNumber1 = 31;
constexpr uint32_t kRtpTimestamp0 = 40;
constexpr uint32_t kRtpTimestamp1 = 41;
constexpr absl::optional<uint8_t> kAudioLevel0 = 50;
@ -309,15 +298,15 @@ TEST(SourceTrackerTest, TimedOutSourcesAreRemoved) {
SimulatedClock clock(1000000000000ULL);
SourceTracker tracker(&clock);
tracker.OnFrameDelivered(RtpPacketInfos(
{RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs1}, kSequenceNumber0,
kRtpTimestamp0, kAudioLevel0, kReceiveTimeMs0)}));
tracker.OnFrameDelivered(
RtpPacketInfos({RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs1}, kRtpTimestamp0,
kAudioLevel0, kReceiveTimeMs0)}));
clock.AdvanceTimeMilliseconds(17);
tracker.OnFrameDelivered(RtpPacketInfos(
{RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs2}, kSequenceNumber1,
kRtpTimestamp1, kAudioLevel1, kReceiveTimeMs1)}));
tracker.OnFrameDelivered(
RtpPacketInfos({RtpPacketInfo(kSsrc, {kCsrcs0, kCsrcs2}, kRtpTimestamp1,
kAudioLevel1, kReceiveTimeMs1)}));
int64_t timestamp_ms_1 = clock.TimeInMilliseconds();