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

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

Issue 131233007: Cast: Clean up injection of transport into PacedPacketSender (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged Created 6 years, 10 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
« no previous file with comments | « media/cast/cast_receiver_impl.cc ('k') | media/cast/test/end2end_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 GetDefaultCastSenderLoggingConfig())), 156 GetDefaultCastSenderLoggingConfig())),
157 sender_to_receiver_(testing_clock_), 157 sender_to_receiver_(testing_clock_),
158 receiver_to_sender_(cast_environment_, testing_clock_) { 158 receiver_to_sender_(cast_environment_, testing_clock_) {
159 testing_clock_->Advance( 159 testing_clock_->Advance(
160 base::TimeDelta::FromMilliseconds(kStartMillisecond)); 160 base::TimeDelta::FromMilliseconds(kStartMillisecond));
161 transport::CastTransportConfig transport_config; 161 transport::CastTransportConfig transport_config;
162 transport_sender_.reset(new transport::CastTransportSenderImpl( 162 transport_sender_.reset(new transport::CastTransportSenderImpl(
163 testing_clock_, 163 testing_clock_,
164 transport_config, 164 transport_config,
165 base::Bind(&UpdateCastTransportStatus), 165 base::Bind(&UpdateCastTransportStatus),
166 task_runner_)); 166 task_runner_,
167 transport_sender_->InsertFakeTransportForTesting(&sender_to_receiver_); 167 &sender_to_receiver_));
168 EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(0); 168 EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(0);
169 } 169 }
170 170
171 virtual ~RtcpTest() {} 171 virtual ~RtcpTest() {}
172 172
173 static void UpdateCastTransportStatus(transport::CastTransportStatus status) { 173 static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
174 EXPECT_EQ(status, transport::TRANSPORT_INITIALIZED); 174 EXPECT_EQ(status, transport::TRANSPORT_INITIALIZED);
175 } 175 }
176 176
177 void RunTasks(int during_ms) { 177 void RunTasks(int during_ms) {
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions); 622 rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions);
623 rtp_timestamp = 64000; 623 rtp_timestamp = 64000;
624 EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime( 624 EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime(
625 frequency, rtp_timestamp, &rtp_timestamp_in_ticks)); 625 frequency, rtp_timestamp, &rtp_timestamp_in_ticks));
626 EXPECT_EQ(input_time + base::TimeDelta::FromMilliseconds(4000), 626 EXPECT_EQ(input_time + base::TimeDelta::FromMilliseconds(4000),
627 rtp_timestamp_in_ticks); 627 rtp_timestamp_in_ticks);
628 } 628 }
629 629
630 } // namespace cast 630 } // namespace cast
631 } // namespace media 631 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/cast_receiver_impl.cc ('k') | media/cast/test/end2end_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698