Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc |
index c9e01aadd0dffc0d59c5d0fc3a184e752a2fdc2f..f1ce6a915331abc58cbfb692c0519076dc11adb2 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc |
@@ -31,44 +31,42 @@ TEST(RtcpPacketExtendedJitterReportTest, CreateAndParseWithoutItems) { |
ExtendedJitterReport parsed; |
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed)); |
- EXPECT_THAT(parsed.jitters(), IsEmpty()); |
+ EXPECT_THAT(parsed.jitter_values(), IsEmpty()); |
} |
TEST(RtcpPacketExtendedJitterReportTest, CreateAndParseWithOneItem) { |
ExtendedJitterReport ij; |
- EXPECT_TRUE(ij.WithJitter(kJitter1)); |
+ EXPECT_TRUE(ij.SetJitterValues({kJitter1})); |
rtc::Buffer raw = ij.Build(); |
ExtendedJitterReport parsed; |
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed)); |
- EXPECT_THAT(parsed.jitters(), ElementsAre(kJitter1)); |
+ EXPECT_THAT(parsed.jitter_values(), ElementsAre(kJitter1)); |
} |
TEST(RtcpPacketExtendedJitterReportTest, CreateAndParseWithTwoItems) { |
ExtendedJitterReport ij; |
- EXPECT_TRUE(ij.WithJitter(kJitter1)); |
- EXPECT_TRUE(ij.WithJitter(kJitter2)); |
+ EXPECT_TRUE(ij.SetJitterValues({kJitter1, kJitter2})); |
rtc::Buffer raw = ij.Build(); |
ExtendedJitterReport parsed; |
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed)); |
- EXPECT_THAT(parsed.jitters(), ElementsAre(kJitter1, kJitter2)); |
+ EXPECT_THAT(parsed.jitter_values(), ElementsAre(kJitter1, kJitter2)); |
} |
TEST(RtcpPacketExtendedJitterReportTest, CreateWithTooManyItems) { |
ExtendedJitterReport ij; |
- const int kMaxIjItems = (1 << 5) - 1; |
- for (int i = 0; i < kMaxIjItems; ++i) { |
- EXPECT_TRUE(ij.WithJitter(i)); |
- } |
- EXPECT_FALSE(ij.WithJitter(kMaxIjItems)); |
+ const int kMaxItems = ExtendedJitterReport::kMaxNumberOfJitterValues; |
+ EXPECT_FALSE( |
+ ij.SetJitterValues(std::vector<uint32_t>(kMaxItems + 1, kJitter1))); |
+ EXPECT_TRUE(ij.SetJitterValues(std::vector<uint32_t>(kMaxItems, kJitter1))); |
} |
TEST(RtcpPacketExtendedJitterReportTest, ParseFailsWithTooManyItems) { |
ExtendedJitterReport ij; |
- ij.WithJitter(kJitter1); |
+ ij.SetJitterValues({kJitter1}); |
rtc::Buffer raw = ij.Build(); |
raw[0]++; // Damage packet: increase jitter count by 1. |
ExtendedJitterReport parsed; |