OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/test/simple_test_tick_clock.h" | 10 #include "base/test/simple_test_tick_clock.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 audio_config_.channels = 2; | 74 audio_config_.channels = 2; |
75 audio_config_.bitrate = kDefaultAudioEncoderBitrate; | 75 audio_config_.bitrate = kDefaultAudioEncoderBitrate; |
76 audio_config_.rtp_payload_type = 127; | 76 audio_config_.rtp_payload_type = 127; |
77 | 77 |
78 net::IPEndPoint dummy_endpoint; | 78 net::IPEndPoint dummy_endpoint; |
79 | 79 |
80 transport_sender_.reset(new CastTransportSenderImpl( | 80 transport_sender_.reset(new CastTransportSenderImpl( |
81 NULL, | 81 NULL, |
82 testing_clock_, | 82 testing_clock_, |
83 dummy_endpoint, | 83 dummy_endpoint, |
| 84 make_scoped_ptr(new base::DictionaryValue), |
84 base::Bind(&UpdateCastTransportStatus), | 85 base::Bind(&UpdateCastTransportStatus), |
85 BulkRawEventsCallback(), | 86 BulkRawEventsCallback(), |
86 base::TimeDelta(), | 87 base::TimeDelta(), |
87 task_runner_, | 88 task_runner_, |
88 &transport_)); | 89 &transport_)); |
89 audio_sender_.reset(new AudioSender( | 90 audio_sender_.reset(new AudioSender( |
90 cast_environment_, audio_config_, transport_sender_.get())); | 91 cast_environment_, audio_config_, transport_sender_.get())); |
91 task_runner_->RunTasks(); | 92 task_runner_->RunTasks(); |
92 } | 93 } |
93 | 94 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 base::TimeDelta max_rtcp_timeout = | 136 base::TimeDelta max_rtcp_timeout = |
136 base::TimeDelta::FromMilliseconds(1 + kDefaultRtcpIntervalMs * 3 / 2); | 137 base::TimeDelta::FromMilliseconds(1 + kDefaultRtcpIntervalMs * 3 / 2); |
137 testing_clock_->Advance(max_rtcp_timeout); | 138 testing_clock_->Advance(max_rtcp_timeout); |
138 task_runner_->RunTasks(); | 139 task_runner_->RunTasks(); |
139 EXPECT_LE(1, transport_.number_of_rtp_packets()); | 140 EXPECT_LE(1, transport_.number_of_rtp_packets()); |
140 EXPECT_LE(1, transport_.number_of_rtcp_packets()); | 141 EXPECT_LE(1, transport_.number_of_rtcp_packets()); |
141 } | 142 } |
142 | 143 |
143 } // namespace cast | 144 } // namespace cast |
144 } // namespace media | 145 } // namespace media |
OLD | NEW |