Chromium Code Reviews| Index: media/audio/audio_system_impl.cc |
| diff --git a/media/audio/audio_system_impl.cc b/media/audio/audio_system_impl.cc |
| index fdffa70fda0f70cbce1e60457eb2044e9287a254..a6c51a67d863a6086b33b9e470c97d1b8ebf4471 100644 |
| --- a/media/audio/audio_system_impl.cc |
| +++ b/media/audio/audio_system_impl.cc |
| @@ -7,6 +7,7 @@ |
| #include "base/memory/ptr_util.h" |
| #include "base/single_thread_task_runner.h" |
| #include "base/task_runner_util.h" |
| +#include "media/audio/audio_device_description.h" |
| #include "media/audio/audio_manager.h" |
| // Using base::Unretained for |audio_manager_| is safe since it is deleted after |
| @@ -21,13 +22,29 @@ AudioParameters GetInputParametersOnDeviceThread(AudioManager* audio_manager, |
| DCHECK(audio_manager->GetTaskRunner()->BelongsToCurrentThread()); |
| // TODO(olka): remove this when AudioManager::GetInputStreamParameters() |
| - // works this way on all the platforms. |
| + // returns invalid parameters if the device is not found. |
| if (!audio_manager->HasAudioInputDevices()) |
| return AudioParameters(); |
| return audio_manager->GetInputStreamParameters(device_id); |
| } |
| +AudioParameters GetOutputParametersOnDeviceThread( |
| + AudioManager* audio_manager, |
| + const std::string& device_id) { |
| + DCHECK(audio_manager->GetTaskRunner()->BelongsToCurrentThread()); |
| + |
| + // TODO(olka): remove this when |
| + // AudioManager::Get[Default]OutputStreamParameters() returns invalid |
| + // parameters if the device is not found. |
| + if (!audio_manager->HasAudioOutputDevices()) |
| + return AudioParameters(); |
|
Guido Urdaneta
2017/02/15 15:40:06
Should this be UnavailableDeviceParams()?
o1ka
2017/02/15 15:45:07
The client usually needs to check for parameter va
Guido Urdaneta
2017/02/15 15:47:25
Makes sense.
|
| + |
| + return media::AudioDeviceDescription::IsDefaultDevice(device_id) |
| + ? audio_manager->GetDefaultOutputStreamParameters() |
| + : audio_manager->GetOutputStreamParameters(device_id); |
| +} |
| + |
| } // namespace |
| AudioSystemImpl::AudioSystemImpl(AudioManager* audio_manager) |
| @@ -62,6 +79,22 @@ void AudioSystemImpl::GetInputStreamParameters( |
| std::move(on_params_cb)); |
| } |
| +void AudioSystemImpl::GetOutputStreamParameters( |
| + const std::string& device_id, |
| + OnAudioParamsCallback on_params_cb) const { |
| + if (GetTaskRunner()->BelongsToCurrentThread()) { |
| + GetTaskRunner()->PostTask( |
| + FROM_HERE, base::Bind(on_params_cb, GetOutputParametersOnDeviceThread( |
| + audio_manager_, device_id))); |
| + return; |
| + } |
| + base::PostTaskAndReplyWithResult( |
| + GetTaskRunner(), FROM_HERE, |
| + base::Bind(&GetOutputParametersOnDeviceThread, |
| + base::Unretained(audio_manager_), device_id), |
| + std::move(on_params_cb)); |
| +} |
| + |
| void AudioSystemImpl::HasInputDevices(OnBoolCallback on_has_devices_cb) const { |
| if (GetTaskRunner()->BelongsToCurrentThread()) { |
| GetTaskRunner()->PostTask( |