Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(712)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc

Issue 1434213004: rtcp::Ij renamed to rtcp::ExtendedJitterReport and moved into own file (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
index 77520b633bc9de3eced7e4824137f3b320c03844..ac84356c0f078f21e1a0b71c724fdf366e2a2f1f 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
@@ -23,7 +23,6 @@ using webrtc::rtcp::Bye;
using webrtc::rtcp::Dlrr;
using webrtc::rtcp::Empty;
using webrtc::rtcp::Fir;
-using webrtc::rtcp::Ij;
using webrtc::rtcp::Nack;
using webrtc::rtcp::Pli;
using webrtc::rtcp::Sdes;
@@ -196,50 +195,6 @@ TEST(RtcpPacketTest, SrWithTooManyReportBlocks) {
EXPECT_FALSE(sr.WithReportBlock(rb));
}
-TEST(RtcpPacketTest, IjNoItem) {
- Ij ij;
-
- rtc::scoped_ptr<RawPacket> packet(ij.Build());
- RtcpPacketParser parser;
- parser.Parse(packet->Buffer(), packet->Length());
- EXPECT_EQ(1, parser.ij()->num_packets());
- EXPECT_EQ(0, parser.ij_item()->num_packets());
-}
-
-TEST(RtcpPacketTest, IjOneItem) {
- Ij ij;
- EXPECT_TRUE(ij.WithJitterItem(0x11111111));
-
- rtc::scoped_ptr<RawPacket> packet(ij.Build());
- RtcpPacketParser parser;
- parser.Parse(packet->Buffer(), packet->Length());
- EXPECT_EQ(1, parser.ij()->num_packets());
- EXPECT_EQ(1, parser.ij_item()->num_packets());
- EXPECT_EQ(0x11111111U, parser.ij_item()->Jitter());
-}
-
-TEST(RtcpPacketTest, IjTwoItems) {
- Ij ij;
- EXPECT_TRUE(ij.WithJitterItem(0x11111111));
- EXPECT_TRUE(ij.WithJitterItem(0x22222222));
-
- rtc::scoped_ptr<RawPacket> packet(ij.Build());
- RtcpPacketParser parser;
- parser.Parse(packet->Buffer(), packet->Length());
- EXPECT_EQ(1, parser.ij()->num_packets());
- EXPECT_EQ(2, parser.ij_item()->num_packets());
- EXPECT_EQ(0x22222222U, parser.ij_item()->Jitter());
-}
-
-TEST(RtcpPacketTest, IjTooManyItems) {
- Ij ij;
- const int kMaxIjItems = (1 << 5) - 1;
- for (int i = 0; i < kMaxIjItems; ++i) {
- EXPECT_TRUE(ij.WithJitterItem(i));
- }
- EXPECT_FALSE(ij.WithJitterItem(kMaxIjItems));
-}
-
TEST(RtcpPacketTest, AppWithNoData) {
App app;
app.WithSubType(30);

Powered by Google App Engine
This is Rietveld 408576698