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

Side by Side Diff: media/audio/cras/audio_manager_cras.cc

Issue 1901583005: Revert of Pass task runners to AudioManager constructor. (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/audio/cras/audio_manager_cras.h ('k') | media/audio/cras/cras_input_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/audio/cras/audio_manager_cras.h" 5 #include "media/audio/cras/audio_manager_cras.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 bool AudioManagerCras::HasAudioInputDevices() { 128 bool AudioManagerCras::HasAudioInputDevices() {
129 chromeos::AudioDeviceList devices; 129 chromeos::AudioDeviceList devices;
130 chromeos::CrasAudioHandler::Get()->GetAudioDevices(&devices); 130 chromeos::CrasAudioHandler::Get()->GetAudioDevices(&devices);
131 for (size_t i = 0; i < devices.size(); ++i) { 131 for (size_t i = 0; i < devices.size(); ++i) {
132 if (devices[i].is_input && devices[i].is_for_simple_usage()) 132 if (devices[i].is_input && devices[i].is_for_simple_usage())
133 return true; 133 return true;
134 } 134 }
135 return false; 135 return false;
136 } 136 }
137 137
138 AudioManagerCras::AudioManagerCras( 138 AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory)
139 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 139 : AudioManagerBase(audio_log_factory),
140 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
141 AudioLogFactory* audio_log_factory)
142 : AudioManagerBase(std::move(task_runner),
143 std::move(worker_task_runner),
144 audio_log_factory),
145 beamforming_on_device_id_(nullptr), 140 beamforming_on_device_id_(nullptr),
146 beamforming_off_device_id_(nullptr) { 141 beamforming_off_device_id_(nullptr) {
147 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 142 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
148 } 143 }
149 144
150 AudioManagerCras::~AudioManagerCras() { 145 AudioManagerCras::~AudioManagerCras() {
151 Shutdown(); 146 Shutdown();
152 } 147 }
153 148
154 void AudioManagerCras::ShowAudioInputSettings() { 149 void AudioManagerCras::ShowAudioInputSettings() {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 case 24: 285 case 24:
291 return SND_PCM_FORMAT_S24; 286 return SND_PCM_FORMAT_S24;
292 case 32: 287 case 32:
293 return SND_PCM_FORMAT_S32; 288 return SND_PCM_FORMAT_S32;
294 default: 289 default:
295 return SND_PCM_FORMAT_UNKNOWN; 290 return SND_PCM_FORMAT_UNKNOWN;
296 } 291 }
297 } 292 }
298 293
299 } // namespace media 294 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/audio_manager_cras.h ('k') | media/audio/cras/cras_input_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698