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 "media/cast/net/cast_transport_impl.h" | 5 #include "media/cast/net/cast_transport_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 23 matching lines...) Expand all Loading... |
34 int ret; | 34 int ret; |
35 if (options.GetInteger(path, &ret)) { | 35 if (options.GetInteger(path, &ret)) { |
36 return ret; | 36 return ret; |
37 } else { | 37 } else { |
38 return default_value; | 38 return default_value; |
39 } | 39 } |
40 } | 40 } |
41 | 41 |
42 } // namespace | 42 } // namespace |
43 | 43 |
44 scoped_ptr<CastTransport> CastTransport::Create( | 44 std::unique_ptr<CastTransport> CastTransport::Create( |
45 base::TickClock* clock, // Owned by the caller. | 45 base::TickClock* clock, // Owned by the caller. |
46 base::TimeDelta logging_flush_interval, | 46 base::TimeDelta logging_flush_interval, |
47 scoped_ptr<Client> client, | 47 std::unique_ptr<Client> client, |
48 scoped_ptr<PacketTransport> transport, | 48 std::unique_ptr<PacketTransport> transport, |
49 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner) { | 49 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner) { |
50 return scoped_ptr<CastTransport>( | 50 return std::unique_ptr<CastTransport>( |
51 new CastTransportImpl(clock, logging_flush_interval, std::move(client), | 51 new CastTransportImpl(clock, logging_flush_interval, std::move(client), |
52 std::move(transport), transport_task_runner.get())); | 52 std::move(transport), transport_task_runner.get())); |
53 } | 53 } |
54 | 54 |
55 PacketReceiverCallback CastTransport::PacketReceiverForTesting() { | 55 PacketReceiverCallback CastTransport::PacketReceiverForTesting() { |
56 return PacketReceiverCallback(); | 56 return PacketReceiverCallback(); |
57 } | 57 } |
58 | 58 |
59 CastTransportImpl::CastTransportImpl( | 59 CastTransportImpl::CastTransportImpl( |
60 base::TickClock* clock, | 60 base::TickClock* clock, |
61 base::TimeDelta logging_flush_interval, | 61 base::TimeDelta logging_flush_interval, |
62 scoped_ptr<Client> client, | 62 std::unique_ptr<Client> client, |
63 scoped_ptr<PacketTransport> transport, | 63 std::unique_ptr<PacketTransport> transport, |
64 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner) | 64 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner) |
65 : clock_(clock), | 65 : clock_(clock), |
66 logging_flush_interval_(logging_flush_interval), | 66 logging_flush_interval_(logging_flush_interval), |
67 transport_client_(std::move(client)), | 67 transport_client_(std::move(client)), |
68 transport_(std::move(transport)), | 68 transport_(std::move(transport)), |
69 transport_task_runner_(transport_task_runner), | 69 transport_task_runner_(transport_task_runner), |
70 pacer_(kTargetBurstSize, | 70 pacer_(kTargetBurstSize, |
71 kMaxBurstSize, | 71 kMaxBurstSize, |
72 clock, | 72 clock, |
73 logging_flush_interval > base::TimeDelta() ? &recent_packet_events_ | 73 logging_flush_interval > base::TimeDelta() ? &recent_packet_events_ |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 | 252 |
253 PacketReceiverCallback CastTransportImpl::PacketReceiverForTesting() { | 253 PacketReceiverCallback CastTransportImpl::PacketReceiverForTesting() { |
254 return base::Bind(base::IgnoreResult(&CastTransportImpl::OnReceivedPacket), | 254 return base::Bind(base::IgnoreResult(&CastTransportImpl::OnReceivedPacket), |
255 weak_factory_.GetWeakPtr()); | 255 weak_factory_.GetWeakPtr()); |
256 } | 256 } |
257 | 257 |
258 void CastTransportImpl::SendRawEvents() { | 258 void CastTransportImpl::SendRawEvents() { |
259 DCHECK(logging_flush_interval_ > base::TimeDelta()); | 259 DCHECK(logging_flush_interval_ > base::TimeDelta()); |
260 | 260 |
261 if (!recent_frame_events_.empty() || !recent_packet_events_.empty()) { | 261 if (!recent_frame_events_.empty() || !recent_packet_events_.empty()) { |
262 scoped_ptr<std::vector<FrameEvent>> frame_events( | 262 std::unique_ptr<std::vector<FrameEvent>> frame_events( |
263 new std::vector<FrameEvent>()); | 263 new std::vector<FrameEvent>()); |
264 frame_events->swap(recent_frame_events_); | 264 frame_events->swap(recent_frame_events_); |
265 scoped_ptr<std::vector<PacketEvent>> packet_events( | 265 std::unique_ptr<std::vector<PacketEvent>> packet_events( |
266 new std::vector<PacketEvent>()); | 266 new std::vector<PacketEvent>()); |
267 packet_events->swap(recent_packet_events_); | 267 packet_events->swap(recent_packet_events_); |
268 transport_client_->OnLoggingEventsReceived(std::move(frame_events), | 268 transport_client_->OnLoggingEventsReceived(std::move(frame_events), |
269 std::move(packet_events)); | 269 std::move(packet_events)); |
270 } | 270 } |
271 | 271 |
272 transport_task_runner_->PostDelayedTask( | 272 transport_task_runner_->PostDelayedTask( |
273 FROM_HERE, | 273 FROM_HERE, |
274 base::Bind(&CastTransportImpl::SendRawEvents, weak_factory_.GetWeakPtr()), | 274 base::Bind(&CastTransportImpl::SendRawEvents, weak_factory_.GetWeakPtr()), |
275 logging_flush_interval_); | 275 logging_flush_interval_); |
276 } | 276 } |
277 | 277 |
278 bool CastTransportImpl::OnReceivedPacket(scoped_ptr<Packet> packet) { | 278 bool CastTransportImpl::OnReceivedPacket(std::unique_ptr<Packet> packet) { |
279 const uint8_t* const data = &packet->front(); | 279 const uint8_t* const data = &packet->front(); |
280 const size_t length = packet->size(); | 280 const size_t length = packet->size(); |
281 uint32_t ssrc; | 281 uint32_t ssrc; |
282 if (IsRtcpPacket(data, length)) { | 282 if (IsRtcpPacket(data, length)) { |
283 ssrc = GetSsrcOfSender(data, length); | 283 ssrc = GetSsrcOfSender(data, length); |
284 } else if (!RtpParser::ParseSsrc(data, length, &ssrc)) { | 284 } else if (!RtpParser::ParseSsrc(data, length, &ssrc)) { |
285 VLOG(1) << "Invalid RTP packet."; | 285 VLOG(1) << "Invalid RTP packet."; |
286 return false; | 286 return false; |
287 } | 287 } |
288 if (valid_sender_ssrcs_.find(ssrc) == valid_sender_ssrcs_.end()) { | 288 if (valid_sender_ssrcs_.find(ssrc) == valid_sender_ssrcs_.end()) { |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 "calling CastTransportImpl::SendRtcpFromRtpReceiver."; | 481 "calling CastTransportImpl::SendRtcpFromRtpReceiver."; |
482 return; | 482 return; |
483 } | 483 } |
484 pacer_.SendRtcpPacket(rtcp_builder_at_rtp_receiver_->local_ssrc(), | 484 pacer_.SendRtcpPacket(rtcp_builder_at_rtp_receiver_->local_ssrc(), |
485 rtcp_builder_at_rtp_receiver_->Finish()); | 485 rtcp_builder_at_rtp_receiver_->Finish()); |
486 rtcp_builder_at_rtp_receiver_.reset(); | 486 rtcp_builder_at_rtp_receiver_.reset(); |
487 } | 487 } |
488 | 488 |
489 } // namespace cast | 489 } // namespace cast |
490 } // namespace media | 490 } // namespace media |
OLD | NEW |