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

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

Issue 1855633002: Revert of [chromecast] Pass media task runner to MediaPipelineBackendManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@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/single_thread_task_runner.h" 9 #include "base/bind.h"
10 #include "base/lazy_instance.h"
11 #include "base/location.h"
12 #include "chromecast/media/base/media_message_loop.h"
10 #include "chromecast/media/cma/backend/media_pipeline_backend_wrapper.h" 13 #include "chromecast/media/cma/backend/media_pipeline_backend_wrapper.h"
11 #include "chromecast/public/cast_media_shlib.h" 14 #include "chromecast/public/cast_media_shlib.h"
12 15
13 namespace chromecast { 16 namespace chromecast {
14 namespace media { 17 namespace media {
15 18
16 MediaPipelineBackendManager::MediaPipelineBackendManager( 19 namespace {
17 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner)
18 : media_task_runner_(std::move(media_task_runner)) {
19 }
20 20
21 MediaPipelineBackendManager::~MediaPipelineBackendManager() { 21 base::LazyInstance<MediaPipelineBackendManager> g_instance =
22 } 22 LAZY_INSTANCE_INITIALIZER;
23 23
24 scoped_ptr<MediaPipelineBackend> 24 } // namespace
25 MediaPipelineBackendManager::CreateMediaPipelineBackend( 25
26 // static
27 MediaPipelineBackend* MediaPipelineBackendManager::CreateMediaPipelineBackend(
26 const media::MediaPipelineDeviceParams& params) { 28 const media::MediaPipelineDeviceParams& params) {
27 DCHECK(media_task_runner_->BelongsToCurrentThread()); 29 DCHECK(MediaMessageLoop::GetTaskRunner()->BelongsToCurrentThread());
28 return CreateMediaPipelineBackend(params, 0); 30 return CreateMediaPipelineBackend(params, 0);
29 } 31 }
30 32
31 scoped_ptr<MediaPipelineBackend> 33 // static
32 MediaPipelineBackendManager::CreateMediaPipelineBackend( 34 MediaPipelineBackend* MediaPipelineBackendManager::CreateMediaPipelineBackend(
33 const media::MediaPipelineDeviceParams& params, 35 const media::MediaPipelineDeviceParams& params,
34 int stream_type) { 36 int stream_type) {
35 DCHECK(media_task_runner_->BelongsToCurrentThread()); 37 DCHECK(MediaMessageLoop::GetTaskRunner()->BelongsToCurrentThread());
36 scoped_ptr<MediaPipelineBackend> backend_ptr(new MediaPipelineBackendWrapper( 38 MediaPipelineBackendManager* backend_manager = Get();
37 make_scoped_ptr( 39 MediaPipelineBackendWrapper* backend_ptr = new MediaPipelineBackendWrapper(
38 media::CastMediaShlib::CreateMediaPipelineBackend(params)), 40 media::CastMediaShlib::CreateMediaPipelineBackend(params), stream_type,
39 stream_type, GetVolumeMultiplier(stream_type), this)); 41 backend_manager->GetVolumeMultiplier(stream_type));
40 media_pipeline_backends_.push_back(backend_ptr.get()); 42 backend_manager->media_pipeline_backends_.push_back(backend_ptr);
41 return backend_ptr; 43 return backend_ptr;
42 } 44 }
43 45
46 // static
44 void MediaPipelineBackendManager::OnMediaPipelineBackendDestroyed( 47 void MediaPipelineBackendManager::OnMediaPipelineBackendDestroyed(
45 const MediaPipelineBackend* backend) { 48 const MediaPipelineBackend* backend) {
46 DCHECK(media_task_runner_->BelongsToCurrentThread()); 49 DCHECK(MediaMessageLoop::GetTaskRunner()->BelongsToCurrentThread());
47 media_pipeline_backends_.erase( 50 MediaPipelineBackendManager* backend_manager = Get();
48 std::remove(media_pipeline_backends_.begin(), 51 backend_manager->media_pipeline_backends_.erase(
49 media_pipeline_backends_.end(), backend), 52 std::remove(backend_manager->media_pipeline_backends_.begin(),
50 media_pipeline_backends_.end()); 53 backend_manager->media_pipeline_backends_.end(), backend),
54 backend_manager->media_pipeline_backends_.end());
51 } 55 }
52 56
57 // static
53 void MediaPipelineBackendManager::SetVolumeMultiplier(int stream_type, 58 void MediaPipelineBackendManager::SetVolumeMultiplier(int stream_type,
54 float volume) { 59 float volume) {
55 DCHECK(media_task_runner_->BelongsToCurrentThread()); 60 DCHECK(MediaMessageLoop::GetTaskRunner()->BelongsToCurrentThread());
61 MediaPipelineBackendManager* backend_manager = Get();
56 volume = std::max(0.0f, std::min(volume, 1.0f)); 62 volume = std::max(0.0f, std::min(volume, 1.0f));
57 volume_by_stream_type_[stream_type] = volume; 63 backend_manager->volume_by_stream_type_[stream_type] = volume;
58 64
59 // Set volume for each open media pipeline backends. 65 // Set volume for each open media pipeline backends.
60 for (auto it = media_pipeline_backends_.begin(); 66 for (auto it = backend_manager->media_pipeline_backends_.begin();
61 it != media_pipeline_backends_.end(); it++) { 67 it != backend_manager->media_pipeline_backends_.end(); it++) {
62 MediaPipelineBackendWrapper* wrapper = 68 MediaPipelineBackendWrapper* wrapper =
63 static_cast<MediaPipelineBackendWrapper*>(*it); 69 static_cast<MediaPipelineBackendWrapper*>(*it);
64 if (wrapper->GetStreamType() == stream_type) 70 if (wrapper->GetStreamType() == stream_type)
65 wrapper->SetStreamTypeVolume(volume); 71 wrapper->SetStreamTypeVolume(volume);
66 } 72 }
67 } 73 }
68 74
75 // static
76 MediaPipelineBackendManager* MediaPipelineBackendManager::Get() {
77 return g_instance.Pointer();
78 }
79
80 MediaPipelineBackendManager::MediaPipelineBackendManager() {
81 }
82
83 MediaPipelineBackendManager::~MediaPipelineBackendManager() {
84 }
85
69 float MediaPipelineBackendManager::GetVolumeMultiplier(int stream_type) { 86 float MediaPipelineBackendManager::GetVolumeMultiplier(int stream_type) {
70 DCHECK(media_task_runner_->BelongsToCurrentThread()); 87 DCHECK(MediaMessageLoop::GetTaskRunner()->BelongsToCurrentThread());
71 auto it = volume_by_stream_type_.find(stream_type); 88 MediaPipelineBackendManager* backend_manager = Get();
72 if (it == volume_by_stream_type_.end()) { 89 auto it = backend_manager->volume_by_stream_type_.find(stream_type);
90 if (it == backend_manager->volume_by_stream_type_.end()) {
73 return 1.0; 91 return 1.0;
74 } else { 92 } else {
75 return it->second; 93 return it->second;
76 } 94 }
77 } 95 }
78 96
79 } // namespace media 97 } // namespace media
80 } // namespace chromecast 98 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698