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

[rtp_rtcp] rtcp::Tmmbn moved into own file

Browse Source 
explicetly unchanged.

BUG=webrtc:5260
R=åsapersson

Review URL: https://codereview.webrtc.org/1578713002

Cr-Commit-Position: refs/heads/master@{#11201}
This commit is contained in:
danilchap
2016-01-11 03:31:08 -08:00
committed by Commit bot
parent d36efeb622
commit ef3d805f6e
10 changed files with 269 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
View File

@ -35,7 +35,6 @@ using webrtc::rtcp::Rrtr;
using webrtc::rtcp::Sdes;
using webrtc::rtcp::SenderReport;
using webrtc::rtcp::Sli;
using webrtc::rtcp::Tmmbn;
using webrtc::rtcp::Tmmbr;
using webrtc::rtcp::VoipMetric;
using webrtc::rtcp::Xr;
@ -514,64 +513,6 @@ TEST(RtcpPacketTest, Tmmbr) {
EXPECT_EQ(60U, parser.tmmbr_item()->Overhead());
}
TEST(RtcpPacketTest, TmmbnWithNoItem) {
Tmmbn tmmbn;
tmmbn.From(kSenderSsrc);
rtc::scoped_ptr<RawPacket> packet(tmmbn.Build());
RtcpPacketParser parser;
parser.Parse(packet->Buffer(), packet->Length());
EXPECT_EQ(1, parser.tmmbn()->num_packets());
EXPECT_EQ(kSenderSsrc, parser.tmmbn()->Ssrc());
EXPECT_EQ(0, parser.tmmbn_items()->num_packets());
}
TEST(RtcpPacketTest, TmmbnWithOneItem) {
Tmmbn tmmbn;
tmmbn.From(kSenderSsrc);
EXPECT_TRUE(tmmbn.WithTmmbr(kRemoteSsrc, 312, 60));
rtc::scoped_ptr<RawPacket> packet(tmmbn.Build());
RtcpPacketParser parser;
parser.Parse(packet->Buffer(), packet->Length());
EXPECT_EQ(1, parser.tmmbn()->num_packets());
EXPECT_EQ(kSenderSsrc, parser.tmmbn()->Ssrc());
EXPECT_EQ(1, parser.tmmbn_items()->num_packets());
EXPECT_EQ(kRemoteSsrc, parser.tmmbn_items()->Ssrc(0));
EXPECT_EQ(312U, parser.tmmbn_items()->BitrateKbps(0));
EXPECT_EQ(60U, parser.tmmbn_items()->Overhead(0));
}
TEST(RtcpPacketTest, TmmbnWithTwoItems) {
Tmmbn tmmbn;
tmmbn.From(kSenderSsrc);
EXPECT_TRUE(tmmbn.WithTmmbr(kRemoteSsrc, 312, 60));
EXPECT_TRUE(tmmbn.WithTmmbr(kRemoteSsrc + 1, 1288, 40));
rtc::scoped_ptr<RawPacket> packet(tmmbn.Build());
RtcpPacketParser parser;
parser.Parse(packet->Buffer(), packet->Length());
EXPECT_EQ(1, parser.tmmbn()->num_packets());
EXPECT_EQ(kSenderSsrc, parser.tmmbn()->Ssrc());
EXPECT_EQ(2, parser.tmmbn_items()->num_packets());
EXPECT_EQ(kRemoteSsrc, parser.tmmbn_items()->Ssrc(0));
EXPECT_EQ(312U, parser.tmmbn_items()->BitrateKbps(0));
EXPECT_EQ(60U, parser.tmmbn_items()->Overhead(0));
EXPECT_EQ(kRemoteSsrc + 1, parser.tmmbn_items()->Ssrc(1));
EXPECT_EQ(1288U, parser.tmmbn_items()->BitrateKbps(1));
EXPECT_EQ(40U, parser.tmmbn_items()->Overhead(1));
}
TEST(RtcpPacketTest, TmmbnWithTooManyItems) {
Tmmbn tmmbn;
tmmbn.From(kSenderSsrc);
const int kMaxTmmbrItems = 50;
for (int i = 0; i < kMaxTmmbrItems; ++i)
EXPECT_TRUE(tmmbn.WithTmmbr(kRemoteSsrc + i, 312, 60));
EXPECT_FALSE(tmmbn.WithTmmbr(kRemoteSsrc + kMaxTmmbrItems, 312, 60));
}
TEST(RtcpPacketTest, XrWithNoReportBlocks) {
Xr xr;
xr.From(kSenderSsrc);