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

Side by Side Diff: media/cast/test/utility/in_process_receiver.cc

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « media/cast/test/utility/in_process_receiver.h ('k') | media/cast/test/utility/net_utility.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 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/test/utility/in_process_receiver.h" 5 #include "media/cast/test/utility/in_process_receiver.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/memory/ptr_util.h"
10 #include "base/synchronization/waitable_event.h" 11 #include "base/synchronization/waitable_event.h"
11 #include "base/time/time.h" 12 #include "base/time/time.h"
12 #include "base/values.h" 13 #include "base/values.h"
13 #include "media/base/video_frame.h" 14 #include "media/base/video_frame.h"
14 #include "media/cast/cast_config.h" 15 #include "media/cast/cast_config.h"
15 #include "media/cast/cast_environment.h" 16 #include "media/cast/cast_environment.h"
16 #include "media/cast/cast_receiver.h" 17 #include "media/cast/cast_receiver.h"
17 #include "media/cast/net/cast_transport_config.h" 18 #include "media/cast/net/cast_transport_config.h"
18 #include "media/cast/net/udp_transport.h" 19 #include "media/cast/net/udp_transport.h"
19 20
20 using media::cast::CastTransportStatus; 21 using media::cast::CastTransportStatus;
21 using media::cast::UdpTransport; 22 using media::cast::UdpTransport;
22 23
23 namespace media { 24 namespace media {
24 namespace cast { 25 namespace cast {
25 26
26 void InProcessReceiver::TransportClient::OnStatusChanged( 27 void InProcessReceiver::TransportClient::OnStatusChanged(
27 CastTransportStatus status) { 28 CastTransportStatus status) {
28 LOG_IF(ERROR, status == media::cast::TRANSPORT_SOCKET_ERROR) 29 LOG_IF(ERROR, status == media::cast::TRANSPORT_SOCKET_ERROR)
29 << "Transport socket error occurred. InProcessReceiver is likely " 30 << "Transport socket error occurred. InProcessReceiver is likely "
30 "dead."; 31 "dead.";
31 VLOG(1) << "CastTransportStatus is now " << status; 32 VLOG(1) << "CastTransportStatus is now " << status;
32 } 33 }
33 34
34 void InProcessReceiver::TransportClient::ProcessRtpPacket( 35 void InProcessReceiver::TransportClient::ProcessRtpPacket(
35 scoped_ptr<Packet> packet) { 36 std::unique_ptr<Packet> packet) {
36 in_process_receiver_->ReceivePacket(std::move(packet)); 37 in_process_receiver_->ReceivePacket(std::move(packet));
37 } 38 }
38 39
39 InProcessReceiver::InProcessReceiver( 40 InProcessReceiver::InProcessReceiver(
40 const scoped_refptr<CastEnvironment>& cast_environment, 41 const scoped_refptr<CastEnvironment>& cast_environment,
41 const net::IPEndPoint& local_end_point, 42 const net::IPEndPoint& local_end_point,
42 const net::IPEndPoint& remote_end_point, 43 const net::IPEndPoint& remote_end_point,
43 const FrameReceiverConfig& audio_config, 44 const FrameReceiverConfig& audio_config,
44 const FrameReceiverConfig& video_config) 45 const FrameReceiverConfig& video_config)
45 : cast_environment_(cast_environment), 46 : cast_environment_(cast_environment),
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 VLOG(1) << "CastTransportStatus is now " << status; 89 VLOG(1) << "CastTransportStatus is now " << status;
89 } 90 }
90 91
91 void InProcessReceiver::StartOnMainThread() { 92 void InProcessReceiver::StartOnMainThread() {
92 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 93 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
93 94
94 DCHECK(!transport_ && !cast_receiver_); 95 DCHECK(!transport_ && !cast_receiver_);
95 96
96 transport_ = CastTransport::Create( 97 transport_ = CastTransport::Create(
97 cast_environment_->Clock(), base::TimeDelta(), 98 cast_environment_->Clock(), base::TimeDelta(),
98 make_scoped_ptr(new InProcessReceiver::TransportClient(this)), 99 base::WrapUnique(new InProcessReceiver::TransportClient(this)),
99 make_scoped_ptr(new UdpTransport( 100 base::WrapUnique(new UdpTransport(
100 nullptr, cast_environment_->GetTaskRunner(CastEnvironment::MAIN), 101 nullptr, cast_environment_->GetTaskRunner(CastEnvironment::MAIN),
101 local_end_point_, remote_end_point_, 102 local_end_point_, remote_end_point_,
102 base::Bind(&InProcessReceiver::UpdateCastTransportStatus, 103 base::Bind(&InProcessReceiver::UpdateCastTransportStatus,
103 base::Unretained(this)))), 104 base::Unretained(this)))),
104 cast_environment_->GetTaskRunner(CastEnvironment::MAIN)); 105 cast_environment_->GetTaskRunner(CastEnvironment::MAIN));
105 106
106 cast_receiver_ = CastReceiver::Create( 107 cast_receiver_ = CastReceiver::Create(
107 cast_environment_, audio_config_, video_config_, transport_.get()); 108 cast_environment_, audio_config_, video_config_, transport_.get());
108 109
109 PullNextAudioFrame(); 110 PullNextAudioFrame();
110 PullNextVideoFrame(); 111 PullNextVideoFrame();
111 } 112 }
112 113
113 void InProcessReceiver::GotAudioFrame(scoped_ptr<AudioBus> audio_frame, 114 void InProcessReceiver::GotAudioFrame(std::unique_ptr<AudioBus> audio_frame,
114 const base::TimeTicks& playout_time, 115 const base::TimeTicks& playout_time,
115 bool is_continuous) { 116 bool is_continuous) {
116 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 117 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
117 if (audio_frame.get()) 118 if (audio_frame.get())
118 OnAudioFrame(std::move(audio_frame), playout_time, is_continuous); 119 OnAudioFrame(std::move(audio_frame), playout_time, is_continuous);
119 PullNextAudioFrame(); 120 PullNextAudioFrame();
120 } 121 }
121 122
122 void InProcessReceiver::GotVideoFrame( 123 void InProcessReceiver::GotVideoFrame(
123 const scoped_refptr<VideoFrame>& video_frame, 124 const scoped_refptr<VideoFrame>& video_frame,
(...skipping 11 matching lines...) Expand all
135 base::Bind(&InProcessReceiver::GotAudioFrame, 136 base::Bind(&InProcessReceiver::GotAudioFrame,
136 weak_factory_.GetWeakPtr())); 137 weak_factory_.GetWeakPtr()));
137 } 138 }
138 139
139 void InProcessReceiver::PullNextVideoFrame() { 140 void InProcessReceiver::PullNextVideoFrame() {
140 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 141 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
141 cast_receiver_->RequestDecodedVideoFrame(base::Bind( 142 cast_receiver_->RequestDecodedVideoFrame(base::Bind(
142 &InProcessReceiver::GotVideoFrame, weak_factory_.GetWeakPtr())); 143 &InProcessReceiver::GotVideoFrame, weak_factory_.GetWeakPtr()));
143 } 144 }
144 145
145 void InProcessReceiver::ReceivePacket(scoped_ptr<Packet> packet) { 146 void InProcessReceiver::ReceivePacket(std::unique_ptr<Packet> packet) {
146 // TODO(Hubbe): Make an InsertPacket method instead. 147 // TODO(Hubbe): Make an InsertPacket method instead.
147 cast_receiver_->ReceivePacket(std::move(packet)); 148 cast_receiver_->ReceivePacket(std::move(packet));
148 } 149 }
149 150
150 } // namespace cast 151 } // namespace cast
151 } // namespace media 152 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/test/utility/in_process_receiver.h ('k') | media/cast/test/utility/net_utility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698