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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/rtcp/rtcp_unittest.cc

Issue 281453003: Cast: Simplify code path for RTCP sender report (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« media/cast/cast_defines.h ('K') | « media/cast/rtcp/rtcp.cc ('k') | media/cast/test/sender.cc » ('j') | media/cast/video_sender/video_sender.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/rtcp/rtcp_unittest.cc
diff --git a/media/cast/rtcp/rtcp_unittest.cc b/media/cast/rtcp/rtcp_unittest.cc
index bfe3d73aca43465c7e9c29c2e2d3f31f45183f22..1b04726126c7931d8cb09f77c581c038012aa076 100644
--- a/media/cast/rtcp/rtcp_unittest.cc
+++ b/media/cast/rtcp/rtcp_unittest.cc
@@ -26,7 +26,6 @@ static const uint32 kSenderSsrc = 0x10203;
static const uint32 kReceiverSsrc = 0x40506;
static const std::string kCName("test@10.1.1.1");
static const uint32 kRtcpIntervalMs = 500;
-static const int64 kStartMillisecond = INT64_C(12345678900000);
static const int64 kAddedDelay = 123;
static const int64 kAddedShortDelay = 100;
@@ -159,9 +158,8 @@ class RtcpTest : public ::testing::Test {
task_runner_)),
sender_to_receiver_(testing_clock_),
receiver_to_sender_(cast_environment_, testing_clock_),
- rtp_sender_stats_(kVideoFrequency) {
- testing_clock_->Advance(
- base::TimeDelta::FromMilliseconds(kStartMillisecond));
+ start_time_(base::TimeTicks::Now() - base::TimeTicks()) {
+ testing_clock_->Advance(start_time_);
net::IPEndPoint dummy_endpoint;
transport_sender_.reset(new transport::CastTransportSenderImpl(
NULL,
@@ -172,6 +170,10 @@ class RtcpTest : public ::testing::Test {
base::TimeDelta(),
task_runner_,
&sender_to_receiver_));
+ transport::CastTransportAudioConfig config;
+ config.rtp.config.ssrc = kSenderSsrc;
+ config.rtp.max_outstanding_frames = 1;
+ transport_sender_->InitializeAudio(config);
EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(0);
}
@@ -198,14 +200,14 @@ class RtcpTest : public ::testing::Test {
scoped_ptr<transport::CastTransportSenderImpl> transport_sender_;
LocalRtcpTransport receiver_to_sender_;
MockRtcpSenderFeedback mock_sender_feedback_;
- RtpSenderStatistics rtp_sender_stats_;
+ base::TimeDelta start_time_;
miu 2014/05/13 01:11:56 You don't need this extra member (see comment belo
Alpha Left Google 2014/05/13 21:45:39 Done.
DISALLOW_COPY_AND_ASSIGN(RtcpTest);
};
TEST_F(RtcpTest, TimeToSend) {
base::TimeTicks start_time;
miu 2014/05/13 01:11:56 Suggestion: Delete this line and the next, and rep
Alpha Left Google 2014/05/13 21:45:39 Done.
- start_time += base::TimeDelta::FromMilliseconds(kStartMillisecond);
+ start_time += start_time_;
Rtcp rtcp(cast_environment_,
&mock_sender_feedback_,
transport_sender_.get(),
@@ -240,7 +242,7 @@ TEST_F(RtcpTest, BasicSenderReport) {
kCName,
true);
sender_to_receiver_.set_rtcp_receiver(&rtcp);
- rtcp.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp.SendRtcpFromRtpSender(base::TimeTicks(), 0);
}
TEST_F(RtcpTest, BasicReceiverReport) {
@@ -325,7 +327,7 @@ TEST_F(RtcpTest, RttReducedSizeRtcp) {
EXPECT_FALSE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1);
RunTasks(33);
rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
EXPECT_TRUE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
@@ -334,7 +336,7 @@ TEST_F(RtcpTest, RttReducedSizeRtcp) {
EXPECT_NEAR(2 * kAddedDelay, avg_rtt.InMilliseconds(), 2);
EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 2);
EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
- rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 2);
RunTasks(33);
EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
@@ -381,7 +383,7 @@ TEST_F(RtcpTest, Rtt) {
EXPECT_FALSE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
- rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1);
RunTasks(33);
rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
@@ -396,7 +398,7 @@ TEST_F(RtcpTest, Rtt) {
EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 2);
EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
- rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 2);
RunTasks(33);
EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
EXPECT_NEAR(2 * kAddedDelay, rtt.InMilliseconds(), 2);
@@ -414,7 +416,7 @@ TEST_F(RtcpTest, Rtt) {
EXPECT_NEAR(kAddedDelay + kAddedShortDelay, min_rtt.InMilliseconds(), 2);
EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
- rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 3);
RunTasks(33);
EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
EXPECT_NEAR(2 * kAddedShortDelay, rtt.InMilliseconds(), 1);
@@ -446,8 +448,8 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
NULL,
kRtcpReducedSize,
base::TimeDelta::FromMilliseconds(kRtcpIntervalMs),
- kSenderSsrc,
kReceiverSsrc,
+ kSenderSsrc,
kCName,
true);
@@ -459,8 +461,8 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
NULL,
kRtcpReducedSize,
base::TimeDelta::FromMilliseconds(kRtcpIntervalMs),
- kReceiverSsrc,
kSenderSsrc,
+ kReceiverSsrc,
kCName,
true);
@@ -468,7 +470,7 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
sender_to_receiver_.set_rtcp_receiver(&rtcp_receiver);
rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
- rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 0);
RunTasks(33);
base::TimeDelta rtt;
@@ -487,7 +489,7 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
receiver_to_sender_.set_drop_packets(true);
rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
- rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+ rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1);
RunTasks(33);
EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
« media/cast/cast_defines.h ('K') | « media/cast/rtcp/rtcp.cc ('k') | media/cast/test/sender.cc » ('j') | media/cast/video_sender/video_sender.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698