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

Side by Side Diff: chromecast/media/cma/backend/media_pipeline_backend_manager.cc

Issue 1875623002: Convert //chromecast 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "chromecast/media/cma/backend/media_pipeline_backend_manager.h" 5 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/memory/ptr_util.h"
9 #include "chromecast/media/cma/backend/media_pipeline_backend_wrapper.h" 10 #include "chromecast/media/cma/backend/media_pipeline_backend_wrapper.h"
10 #include "chromecast/public/cast_media_shlib.h" 11 #include "chromecast/public/cast_media_shlib.h"
11 12
12 namespace chromecast { 13 namespace chromecast {
13 namespace media { 14 namespace media {
14 15
15 MediaPipelineBackendManager::MediaPipelineBackendManager( 16 MediaPipelineBackendManager::MediaPipelineBackendManager(
16 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner) 17 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner)
17 : media_task_runner_(std::move(media_task_runner)) { 18 : media_task_runner_(std::move(media_task_runner)) {
18 } 19 }
19 20
20 MediaPipelineBackendManager::~MediaPipelineBackendManager() { 21 MediaPipelineBackendManager::~MediaPipelineBackendManager() {
21 } 22 }
22 23
23 scoped_ptr<MediaPipelineBackend> 24 std::unique_ptr<MediaPipelineBackend>
24 MediaPipelineBackendManager::CreateMediaPipelineBackend( 25 MediaPipelineBackendManager::CreateMediaPipelineBackend(
25 const media::MediaPipelineDeviceParams& params) { 26 const media::MediaPipelineDeviceParams& params) {
26 DCHECK(media_task_runner_->BelongsToCurrentThread()); 27 DCHECK(media_task_runner_->BelongsToCurrentThread());
27 return CreateMediaPipelineBackend(params, 0); 28 return CreateMediaPipelineBackend(params, 0);
28 } 29 }
29 30
30 scoped_ptr<MediaPipelineBackend> 31 std::unique_ptr<MediaPipelineBackend>
31 MediaPipelineBackendManager::CreateMediaPipelineBackend( 32 MediaPipelineBackendManager::CreateMediaPipelineBackend(
32 const media::MediaPipelineDeviceParams& params, 33 const media::MediaPipelineDeviceParams& params,
33 int stream_type) { 34 int stream_type) {
34 DCHECK(media_task_runner_->BelongsToCurrentThread()); 35 DCHECK(media_task_runner_->BelongsToCurrentThread());
35 scoped_ptr<MediaPipelineBackend> backend_ptr(new MediaPipelineBackendWrapper( 36 std::unique_ptr<MediaPipelineBackend> backend_ptr(
36 make_scoped_ptr( 37 new MediaPipelineBackendWrapper(
37 media::CastMediaShlib::CreateMediaPipelineBackend(params)), 38 base::WrapUnique(
38 stream_type, GetVolumeMultiplier(stream_type), this)); 39 media::CastMediaShlib::CreateMediaPipelineBackend(params)),
40 stream_type, GetVolumeMultiplier(stream_type), this));
39 media_pipeline_backends_.push_back(backend_ptr.get()); 41 media_pipeline_backends_.push_back(backend_ptr.get());
40 return backend_ptr; 42 return backend_ptr;
41 } 43 }
42 44
43 void MediaPipelineBackendManager::OnMediaPipelineBackendDestroyed( 45 void MediaPipelineBackendManager::OnMediaPipelineBackendDestroyed(
44 const MediaPipelineBackend* backend) { 46 const MediaPipelineBackend* backend) {
45 DCHECK(media_task_runner_->BelongsToCurrentThread()); 47 DCHECK(media_task_runner_->BelongsToCurrentThread());
46 media_pipeline_backends_.erase( 48 media_pipeline_backends_.erase(
47 std::remove(media_pipeline_backends_.begin(), 49 std::remove(media_pipeline_backends_.begin(),
48 media_pipeline_backends_.end(), backend), 50 media_pipeline_backends_.end(), backend),
(...skipping 21 matching lines...) Expand all
70 auto it = volume_by_stream_type_.find(stream_type); 72 auto it = volume_by_stream_type_.find(stream_type);
71 if (it == volume_by_stream_type_.end()) { 73 if (it == volume_by_stream_type_.end()) {
72 return 1.0; 74 return 1.0;
73 } else { 75 } else {
74 return it->second; 76 return it->second;
75 } 77 }
76 } 78 }
77 79
78 } // namespace media 80 } // namespace media
79 } // namespace chromecast 81 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698