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

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

Issue 1474693002: [Splitting] TMMBRHelp class simplifted (and disappear because become too simple) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months 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
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_sender.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index a4d6e59c8f80a9f82320bf4f44d246516db54465..42a78254f030754c123e02f15395dd1ac894c0d8 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -663,7 +663,7 @@ TEST_F(RtcpSenderTest, SendTmmbr) {
EXPECT_EQ(1, parser()->tmmbr()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->tmmbr()->Ssrc());
EXPECT_EQ(1, parser()->tmmbr_item()->num_packets());
- EXPECT_EQ(kBitrateBps / 1000, parser()->tmmbr_item()->BitrateKbps());
+ EXPECT_EQ(kBitrateBps, parser()->tmmbr_item()->BitrateKbps() * 1000);
// TODO(asapersson): tmmbr_item()->Overhead() looks broken, always zero.
}
@@ -688,20 +688,19 @@ TEST_F(RtcpSenderTest, TmmbrIncludedInCompoundPacketIfEnabled) {
TEST_F(RtcpSenderTest, SendTmmbn) {
rtcp_sender_->SetRTCPStatus(RtcpMode::kCompound);
+
std::vector<rtcp::TmmbItem> bounding_set;
- const uint32_t kBitrateKbps = 32768;
+ const uint32_t kBitrateBps = 32768000;
const uint32_t kPacketOh = 40;
const uint32_t kSourceSsrc = 12345;
- const rtcp::TmmbItem tmmbn(kSourceSsrc, kBitrateKbps * 1000, kPacketOh);
- bounding_set.push_back(tmmbn);
+ bounding_set.push_back(rtcp::TmmbItem(kSourceSsrc, kBitrateBps, kPacketOh));
rtcp_sender_->SetTMMBN(&bounding_set);
-
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpSr));
EXPECT_EQ(1, parser()->sender_report()->num_packets());
EXPECT_EQ(1, parser()->tmmbn()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->tmmbn()->Ssrc());
EXPECT_EQ(1, parser()->tmmbn_items()->num_packets());
- EXPECT_EQ(kBitrateKbps, parser()->tmmbn_items()->BitrateKbps(0));
+ EXPECT_EQ(kBitrateBps, parser()->tmmbn_items()->BitrateKbps(0) * 1000);
EXPECT_EQ(kPacketOh, parser()->tmmbn_items()->Overhead(0));
EXPECT_EQ(kSourceSsrc, parser()->tmmbn_items()->Ssrc(0));
}
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_sender.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698