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

Side by Side Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/media/audio_renderer_host.h" 5 #include "content/browser/renderer_host/media/audio_renderer_host.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility>
8 9
9 #include "base/bind.h" 10 #include "base/bind.h"
10 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
11 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "base/memory/shared_memory.h" 14 #include "base/memory/shared_memory.h"
14 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
15 #include "base/process/process.h" 16 #include "base/process/process.h"
16 #include "content/browser/bad_message.h" 17 #include "content/browser/bad_message.h"
17 #include "content/browser/browser_main_loop.h" 18 #include "content/browser/browser_main_loop.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 AudioRendererHost* host, 198 AudioRendererHost* host,
198 int stream_id, 199 int stream_id,
199 int render_frame_id, 200 int render_frame_id,
200 const media::AudioParameters& params, 201 const media::AudioParameters& params,
201 const std::string& output_device_id, 202 const std::string& output_device_id,
202 scoped_ptr<base::SharedMemory> shared_memory, 203 scoped_ptr<base::SharedMemory> shared_memory,
203 scoped_ptr<media::AudioOutputController::SyncReader> reader) 204 scoped_ptr<media::AudioOutputController::SyncReader> reader)
204 : host_(host), 205 : host_(host),
205 stream_id_(stream_id), 206 stream_id_(stream_id),
206 render_frame_id_(render_frame_id), 207 render_frame_id_(render_frame_id),
207 shared_memory_(shared_memory.Pass()), 208 shared_memory_(std::move(shared_memory)),
208 reader_(reader.Pass()), 209 reader_(std::move(reader)),
209 controller_(media::AudioOutputController::Create(host->audio_manager_, 210 controller_(media::AudioOutputController::Create(host->audio_manager_,
210 this, 211 this,
211 params, 212 params,
212 output_device_id, 213 output_device_id,
213 reader_.get())), 214 reader_.get())),
214 playing_(false) { 215 playing_(false) {
215 DCHECK(controller_.get()); 216 DCHECK(controller_.get());
216 } 217 }
217 218
218 AudioRendererHost::AudioEntry::~AudioEntry() {} 219 AudioRendererHost::AudioEntry::~AudioEntry() {}
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 return; 587 return;
587 } 588 }
588 589
589 MediaObserver* const media_observer = 590 MediaObserver* const media_observer =
590 GetContentClient()->browser()->GetMediaObserver(); 591 GetContentClient()->browser()->GetMediaObserver();
591 if (media_observer) 592 if (media_observer)
592 media_observer->OnCreatingAudioStream(render_process_id_, render_frame_id); 593 media_observer->OnCreatingAudioStream(render_process_id_, render_frame_id);
593 594
594 scoped_ptr<AudioEntry> entry( 595 scoped_ptr<AudioEntry> entry(
595 new AudioEntry(this, stream_id, render_frame_id, params, device_unique_id, 596 new AudioEntry(this, stream_id, render_frame_id, params, device_unique_id,
596 shared_memory.Pass(), reader.Pass())); 597 std::move(shared_memory), std::move(reader)));
597 if (mirroring_manager_) { 598 if (mirroring_manager_) {
598 mirroring_manager_->AddDiverter( 599 mirroring_manager_->AddDiverter(
599 render_process_id_, entry->render_frame_id(), entry->controller()); 600 render_process_id_, entry->render_frame_id(), entry->controller());
600 } 601 }
601 audio_entries_.insert(std::make_pair(stream_id, entry.release())); 602 audio_entries_.insert(std::make_pair(stream_id, entry.release()));
602 g_audio_streams_tracker.Get().IncreaseStreamCount(); 603 g_audio_streams_tracker.Get().IncreaseStreamCount();
603 604
604 audio_log_->OnCreated(stream_id, params, device_unique_id); 605 audio_log_->OnCreated(stream_id, params, device_unique_id);
605 MediaInternals::GetInstance()->SetWebContentsTitleForAudioLogEntry( 606 MediaInternals::GetInstance()->SetWebContentsTitleForAudioLogEntry(
606 stream_id, render_process_id_, render_frame_id, audio_log_.get()); 607 stream_id, render_process_id_, render_frame_id, audio_log_.get());
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 callback.Run(false, device_info); 843 callback.Run(false, device_info);
843 } 844 }
844 845
845 bool AudioRendererHost::IsAuthorizationStarted(int stream_id) { 846 bool AudioRendererHost::IsAuthorizationStarted(int stream_id) {
846 DCHECK_CURRENTLY_ON(BrowserThread::IO); 847 DCHECK_CURRENTLY_ON(BrowserThread::IO);
847 const auto& i = authorizations_.find(stream_id); 848 const auto& i = authorizations_.find(stream_id);
848 return i != authorizations_.end(); 849 return i != authorizations_.end();
849 } 850 }
850 851
851 } // namespace content 852 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698