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

Side by Side Diff: remoting/host/audio_pump.cc

Issue 1549493004: Use std::move() instead of .Pass() in remoting/host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "remoting/host/audio_pump.h" 5 #include "remoting/host/audio_pump.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 int bytes_pending_; 50 int bytes_pending_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(Core); 52 DISALLOW_COPY_AND_ASSIGN(Core);
53 }; 53 };
54 54
55 AudioPump::Core::Core(base::WeakPtr<AudioPump> pump, 55 AudioPump::Core::Core(base::WeakPtr<AudioPump> pump,
56 scoped_ptr<AudioCapturer> audio_capturer, 56 scoped_ptr<AudioCapturer> audio_capturer,
57 scoped_ptr<AudioEncoder> audio_encoder) 57 scoped_ptr<AudioEncoder> audio_encoder)
58 : pump_(pump), 58 : pump_(pump),
59 pump_task_runner_(base::ThreadTaskRunnerHandle::Get()), 59 pump_task_runner_(base::ThreadTaskRunnerHandle::Get()),
60 audio_capturer_(audio_capturer.Pass()), 60 audio_capturer_(std::move(audio_capturer)),
61 audio_encoder_(audio_encoder.Pass()), 61 audio_encoder_(std::move(audio_encoder)),
62 enabled_(true), 62 enabled_(true),
63 bytes_pending_(0) { 63 bytes_pending_(0) {
64 thread_checker_.DetachFromThread(); 64 thread_checker_.DetachFromThread();
65 } 65 }
66 66
67 AudioPump::Core::~Core() { 67 AudioPump::Core::~Core() {
68 DCHECK(thread_checker_.CalledOnValidThread()); 68 DCHECK(thread_checker_.CalledOnValidThread());
69 } 69 }
70 70
71 void AudioPump::Core::Start() { 71 void AudioPump::Core::Start() {
(...skipping 19 matching lines...) Expand all
91 void AudioPump::Core::EncodeAudioPacket(scoped_ptr<AudioPacket> packet) { 91 void AudioPump::Core::EncodeAudioPacket(scoped_ptr<AudioPacket> packet) {
92 DCHECK(thread_checker_.CalledOnValidThread()); 92 DCHECK(thread_checker_.CalledOnValidThread());
93 DCHECK(packet); 93 DCHECK(packet);
94 94
95 int max_buffered_bytes = 95 int max_buffered_bytes =
96 audio_encoder_->GetBitrate() * kMaxBufferedIntervalMs / 1000 / 8; 96 audio_encoder_->GetBitrate() * kMaxBufferedIntervalMs / 1000 / 8;
97 if (!enabled_ || bytes_pending_ > max_buffered_bytes) 97 if (!enabled_ || bytes_pending_ > max_buffered_bytes)
98 return; 98 return;
99 99
100 scoped_ptr<AudioPacket> encoded_packet = 100 scoped_ptr<AudioPacket> encoded_packet =
101 audio_encoder_->Encode(packet.Pass()); 101 audio_encoder_->Encode(std::move(packet));
102 102
103 // The audio encoder returns a null audio packet if there's no audio to send. 103 // The audio encoder returns a null audio packet if there's no audio to send.
104 if (!encoded_packet) 104 if (!encoded_packet)
105 return; 105 return;
106 106
107 int packet_size = encoded_packet->ByteSize(); 107 int packet_size = encoded_packet->ByteSize();
108 bytes_pending_ += packet_size; 108 bytes_pending_ += packet_size;
109 109
110 pump_task_runner_->PostTask( 110 pump_task_runner_->PostTask(
111 FROM_HERE, base::Bind(&AudioPump::SendAudioPacket, pump_, 111 FROM_HERE, base::Bind(&AudioPump::SendAudioPacket, pump_,
112 base::Passed(&encoded_packet), packet_size)); 112 base::Passed(&encoded_packet), packet_size));
113 } 113 }
114 114
115 AudioPump::AudioPump( 115 AudioPump::AudioPump(
116 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 116 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
117 scoped_ptr<AudioCapturer> audio_capturer, 117 scoped_ptr<AudioCapturer> audio_capturer,
118 scoped_ptr<AudioEncoder> audio_encoder, 118 scoped_ptr<AudioEncoder> audio_encoder,
119 protocol::AudioStub* audio_stub) 119 protocol::AudioStub* audio_stub)
120 : audio_task_runner_(audio_task_runner), 120 : audio_task_runner_(audio_task_runner),
121 audio_stub_(audio_stub), 121 audio_stub_(audio_stub),
122 weak_factory_(this) { 122 weak_factory_(this) {
123 DCHECK(audio_stub_); 123 DCHECK(audio_stub_);
124 124
125 core_.reset(new Core(weak_factory_.GetWeakPtr(), audio_capturer.Pass(), 125 core_.reset(new Core(weak_factory_.GetWeakPtr(), std::move(audio_capturer),
126 audio_encoder.Pass())); 126 std::move(audio_encoder)));
127 127
128 audio_task_runner_->PostTask( 128 audio_task_runner_->PostTask(
129 FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get()))); 129 FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get())));
130 } 130 }
131 131
132 AudioPump::~AudioPump() { 132 AudioPump::~AudioPump() {
133 DCHECK(thread_checker_.CalledOnValidThread()); 133 DCHECK(thread_checker_.CalledOnValidThread());
134 134
135 audio_task_runner_->DeleteSoon(FROM_HERE, core_.release()); 135 audio_task_runner_->DeleteSoon(FROM_HERE, core_.release());
136 } 136 }
137 137
138 void AudioPump::Pause(bool pause) { 138 void AudioPump::Pause(bool pause) {
139 DCHECK(thread_checker_.CalledOnValidThread()); 139 DCHECK(thread_checker_.CalledOnValidThread());
140 140
141 audio_task_runner_->PostTask( 141 audio_task_runner_->PostTask(
142 FROM_HERE, 142 FROM_HERE,
143 base::Bind(&Core::Pause, base::Unretained(core_.get()), pause)); 143 base::Bind(&Core::Pause, base::Unretained(core_.get()), pause));
144 } 144 }
145 145
146 void AudioPump::SendAudioPacket(scoped_ptr<AudioPacket> packet, int size) { 146 void AudioPump::SendAudioPacket(scoped_ptr<AudioPacket> packet, int size) {
147 DCHECK(thread_checker_.CalledOnValidThread()); 147 DCHECK(thread_checker_.CalledOnValidThread());
148 DCHECK(packet); 148 DCHECK(packet);
149 149
150 audio_stub_->ProcessAudioPacket( 150 audio_stub_->ProcessAudioPacket(
151 packet.Pass(), 151 std::move(packet),
152 base::Bind(&AudioPump::OnPacketSent, weak_factory_.GetWeakPtr(), size)); 152 base::Bind(&AudioPump::OnPacketSent, weak_factory_.GetWeakPtr(), size));
153 } 153 }
154 154
155 void AudioPump::OnPacketSent(int size) { 155 void AudioPump::OnPacketSent(int size) {
156 audio_task_runner_->PostTask( 156 audio_task_runner_->PostTask(
157 FROM_HERE, 157 FROM_HERE,
158 base::Bind(&Core::OnPacketSent, base::Unretained(core_.get()), size)); 158 base::Bind(&Core::OnPacketSent, base::Unretained(core_.get()), size));
159 } 159 }
160 160
161 } // namespace remoting 161 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698