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

Side by Side Diff: media/cast/rtcp/rtcp_unittest.cc

Issue 210303003: Cast: Remove LoggingStats in favor of event subscribers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile Created 6 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/test/simple_test_tick_clock.h" 5 #include "base/test/simple_test_tick_clock.h"
6 #include "media/cast/cast_defines.h" 6 #include "media/cast/cast_defines.h"
7 #include "media/cast/cast_environment.h" 7 #include "media/cast/cast_environment.h"
8 #include "media/cast/rtcp/mock_rtcp_receiver_feedback.h" 8 #include "media/cast/rtcp/mock_rtcp_receiver_feedback.h"
9 #include "media/cast/rtcp/mock_rtcp_sender_feedback.h" 9 #include "media/cast/rtcp/mock_rtcp_sender_feedback.h"
10 #include "media/cast/rtcp/rtcp.h" 10 #include "media/cast/rtcp/rtcp.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 using Rtcp::CheckForWrapAround; 137 using Rtcp::CheckForWrapAround;
138 using Rtcp::OnReceivedLipSyncInfo; 138 using Rtcp::OnReceivedLipSyncInfo;
139 }; 139 };
140 140
141 class RtcpTest : public ::testing::Test { 141 class RtcpTest : public ::testing::Test {
142 protected: 142 protected:
143 RtcpTest() 143 RtcpTest()
144 : testing_clock_(new base::SimpleTestTickClock()), 144 : testing_clock_(new base::SimpleTestTickClock()),
145 task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)), 145 task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)),
146 logging_config_(GetDefaultCastSenderLoggingConfig()),
147 cast_environment_(new CastEnvironment( 146 cast_environment_(new CastEnvironment(
148 scoped_ptr<base::TickClock>(testing_clock_).Pass(), 147 scoped_ptr<base::TickClock>(testing_clock_).Pass(),
149 task_runner_, 148 task_runner_,
150 task_runner_, 149 task_runner_,
151 task_runner_, 150 task_runner_)),
152 logging_config_)),
153 sender_to_receiver_(testing_clock_), 151 sender_to_receiver_(testing_clock_),
154 receiver_to_sender_(cast_environment_, testing_clock_), 152 receiver_to_sender_(cast_environment_, testing_clock_),
155 rtp_sender_stats_(kVideoFrequency) { 153 rtp_sender_stats_(kVideoFrequency) {
156 testing_clock_->Advance( 154 testing_clock_->Advance(
157 base::TimeDelta::FromMilliseconds(kStartMillisecond)); 155 base::TimeDelta::FromMilliseconds(kStartMillisecond));
158 net::IPEndPoint dummy_endpoint; 156 net::IPEndPoint dummy_endpoint;
159 transport_sender_.reset(new transport::CastTransportSenderImpl( 157 transport_sender_.reset(new transport::CastTransportSenderImpl(
160 NULL, 158 NULL,
161 testing_clock_, 159 testing_clock_,
162 dummy_endpoint, 160 dummy_endpoint,
163 logging_config_,
164 base::Bind(&UpdateCastTransportStatus), 161 base::Bind(&UpdateCastTransportStatus),
165 transport::BulkRawEventsCallback(), 162 transport::BulkRawEventsCallback(),
166 base::TimeDelta(), 163 base::TimeDelta(),
167 task_runner_, 164 task_runner_,
168 &sender_to_receiver_)); 165 &sender_to_receiver_));
169 EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(0); 166 EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(0);
170 } 167 }
171 168
172 virtual ~RtcpTest() {} 169 virtual ~RtcpTest() {}
173 170
174 static void UpdateCastTransportStatus(transport::CastTransportStatus status) { 171 static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
175 bool result = (status == transport::TRANSPORT_AUDIO_INITIALIZED || 172 bool result = (status == transport::TRANSPORT_AUDIO_INITIALIZED ||
176 status == transport::TRANSPORT_VIDEO_INITIALIZED); 173 status == transport::TRANSPORT_VIDEO_INITIALIZED);
177 EXPECT_TRUE(result); 174 EXPECT_TRUE(result);
178 } 175 }
179 176
180 void RunTasks(int during_ms) { 177 void RunTasks(int during_ms) {
181 for (int i = 0; i < during_ms; ++i) { 178 for (int i = 0; i < during_ms; ++i) {
182 // Call process the timers every 1 ms. 179 // Call process the timers every 1 ms.
183 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(1)); 180 testing_clock_->Advance(base::TimeDelta::FromMilliseconds(1));
184 task_runner_->RunTasks(); 181 task_runner_->RunTasks();
185 } 182 }
186 } 183 }
187 184
188 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. 185 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
189 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; 186 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
190 CastLoggingConfig logging_config_;
191 scoped_refptr<CastEnvironment> cast_environment_; 187 scoped_refptr<CastEnvironment> cast_environment_;
192 RtcpTestPacketSender sender_to_receiver_; 188 RtcpTestPacketSender sender_to_receiver_;
193 scoped_ptr<transport::CastTransportSenderImpl> transport_sender_; 189 scoped_ptr<transport::CastTransportSenderImpl> transport_sender_;
194 LocalRtcpTransport receiver_to_sender_; 190 LocalRtcpTransport receiver_to_sender_;
195 MockRtcpSenderFeedback mock_sender_feedback_; 191 MockRtcpSenderFeedback mock_sender_feedback_;
196 RtpSenderStatistics rtp_sender_stats_; 192 RtpSenderStatistics rtp_sender_stats_;
197 193
198 DISALLOW_COPY_AND_ASSIGN(RtcpTest); 194 DISALLOW_COPY_AND_ASSIGN(RtcpTest);
199 }; 195 };
200 196
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions); 618 rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions);
623 rtp_timestamp = 64000; 619 rtp_timestamp = 64000;
624 EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime( 620 EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime(
625 frequency, rtp_timestamp, &rtp_timestamp_in_ticks)); 621 frequency, rtp_timestamp, &rtp_timestamp_in_ticks));
626 EXPECT_EQ(input_time + base::TimeDelta::FromMilliseconds(4000), 622 EXPECT_EQ(input_time + base::TimeDelta::FromMilliseconds(4000),
627 rtp_timestamp_in_ticks); 623 rtp_timestamp_in_ticks);
628 } 624 }
629 625
630 } // namespace cast 626 } // namespace cast
631 } // namespace media 627 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/rtcp/rtcp_sender_unittest.cc ('k') | media/cast/rtcp/sender_rtcp_event_subscriber_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698