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

Side by Side Diff: chrome/browser/media/cast_transport_host_filter.cc

Issue 2480293004: Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode. (Closed)
Patch Set: Clean up unnecessary release/cast Created 4 years, 1 month 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 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 "chrome/browser/media/cast_transport_host_filter.h" 5 #include "chrome/browser/media/cast_transport_host_filter.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/threading/thread_task_runner_handle.h" 8 #include "base/threading/thread_task_runner_handle.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/common/cast_messages.h" 10 #include "chrome/common/cast_messages.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 local_end_point, remote_end_point, 169 local_end_point, remote_end_point,
170 base::Bind(&CastTransportHostFilter::OnStatusChanged, 170 base::Bind(&CastTransportHostFilter::OnStatusChanged,
171 weak_factory_.GetWeakPtr(), channel_id))); 171 weak_factory_.GetWeakPtr(), channel_id)));
172 udp_transport->SetUdpOptions(options); 172 udp_transport->SetUdpOptions(options);
173 std::unique_ptr<media::cast::CastTransport> transport = 173 std::unique_ptr<media::cast::CastTransport> transport =
174 media::cast::CastTransport::Create( 174 media::cast::CastTransport::Create(
175 &clock_, kSendEventsInterval, 175 &clock_, kSendEventsInterval,
176 base::MakeUnique<TransportClient>(channel_id, this), 176 base::MakeUnique<TransportClient>(channel_id, this),
177 std::move(udp_transport), base::ThreadTaskRunnerHandle::Get()); 177 std::move(udp_transport), base::ThreadTaskRunnerHandle::Get());
178 transport->SetOptions(options); 178 transport->SetOptions(options);
179 id_map_.AddWithID(transport.release(), channel_id); 179 id_map_.AddWithID(std::move(transport), channel_id);
180 } 180 }
181 181
182 void CastTransportHostFilter::OnDelete(int32_t channel_id) { 182 void CastTransportHostFilter::OnDelete(int32_t channel_id) {
183 media::cast::CastTransport* transport = id_map_.Lookup(channel_id); 183 media::cast::CastTransport* transport = id_map_.Lookup(channel_id);
184 if (transport) { 184 if (transport) {
185 id_map_.Remove(channel_id); 185 id_map_.Remove(channel_id);
186 } else { 186 } else {
187 DVLOG(1) << "CastTransportHostFilter::Delete called " 187 DVLOG(1) << "CastTransportHostFilter::Delete called "
188 << "on non-existing channel"; 188 << "on non-existing channel";
189 } 189 }
(...skipping 18 matching lines...) Expand all
208 208
209 void CastTransportHostFilter::OnInitializeStream( 209 void CastTransportHostFilter::OnInitializeStream(
210 int32_t channel_id, 210 int32_t channel_id,
211 const media::cast::CastTransportRtpConfig& config) { 211 const media::cast::CastTransportRtpConfig& config) {
212 media::cast::CastTransport* transport = id_map_.Lookup(channel_id); 212 media::cast::CastTransport* transport = id_map_.Lookup(channel_id);
213 if (transport) { 213 if (transport) {
214 if (config.rtp_payload_type == media::cast::RtpPayloadType::REMOTE_AUDIO || 214 if (config.rtp_payload_type == media::cast::RtpPayloadType::REMOTE_AUDIO ||
215 config.rtp_payload_type == media::cast::RtpPayloadType::REMOTE_VIDEO) { 215 config.rtp_payload_type == media::cast::RtpPayloadType::REMOTE_VIDEO) {
216 // Create CastRemotingSender for this RTP stream. 216 // Create CastRemotingSender for this RTP stream.
217 remoting_sender_map_.AddWithID( 217 remoting_sender_map_.AddWithID(
218 new CastRemotingSender( 218 base::MakeUnique<CastRemotingSender>(
219 transport, config, kSendEventsInterval, 219 transport, config, kSendEventsInterval,
220 base::Bind(&CastTransportHostFilter::OnCastRemotingSenderEvents, 220 base::Bind(&CastTransportHostFilter::OnCastRemotingSenderEvents,
221 weak_factory_.GetWeakPtr(), channel_id)), 221 weak_factory_.GetWeakPtr(), channel_id)),
222 config.rtp_stream_id); 222 config.rtp_stream_id);
223 DVLOG(3) << "Create CastRemotingSender for stream: " 223 DVLOG(3) << "Create CastRemotingSender for stream: "
224 << config.rtp_stream_id; 224 << config.rtp_stream_id;
225 225
226 stream_id_map_.insert(std::make_pair(channel_id, config.rtp_stream_id)); 226 stream_id_map_.insert(std::make_pair(channel_id, config.rtp_stream_id));
227 } else { 227 } else {
228 transport->InitializeStream( 228 transport->InitializeStream(
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 const std::vector<media::cast::FrameEvent>& events) { 382 const std::vector<media::cast::FrameEvent>& events) {
383 if (events.empty()) 383 if (events.empty())
384 return; 384 return;
385 // PacketEvents can only come from CastTransport via CastTransport::Client 385 // PacketEvents can only come from CastTransport via CastTransport::Client
386 // interface. 386 // interface.
387 Send(new CastMsg_RawEvents(channel_id, 387 Send(new CastMsg_RawEvents(channel_id,
388 std::vector<media::cast::PacketEvent>(), events)); 388 std::vector<media::cast::PacketEvent>(), events));
389 } 389 }
390 390
391 } // namespace cast 391 } // namespace cast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698