diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 11:46:36 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 11:46:36 +0000 |
| commit | 0ead785847a7bb25f197530af52732c4264072c2 (patch) | |
| tree | 0d7c7eb3bc6cdda174536967aa5ef3a7396e40a8 /media/audio/audio_output_resampler.cc | |
| parent | 61f4c41a6f9185f24ae4419547635ed3747f1cf0 (diff) | |
| download | chromium_src-0ead785847a7bb25f197530af52732c4264072c2.zip chromium_src-0ead785847a7bb25f197530af52732c4264072c2.tar.gz chromium_src-0ead785847a7bb25f197530af52732c4264072c2.tar.bz2 | |
Wire up the output device id and provide an implementation on Windows.
This adds the output device id to places where we already have an input device id.
On windows we now support a non-default device id in the WASAPI implementation.
BUG=276894
R=henrika@chromium.org
Review URL: https://codereview.chromium.org/23466008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_output_resampler.cc')
| -rw-r--r-- | media/audio/audio_output_resampler.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc index 6db0e2f..da424ec 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc @@ -147,12 +147,13 @@ static AudioParameters SetupFallbackParams( AudioOutputResampler::AudioOutputResampler(AudioManager* audio_manager, const AudioParameters& input_params, const AudioParameters& output_params, + const std::string& output_device_id, const std::string& input_device_id, const base::TimeDelta& close_delay) - : AudioOutputDispatcher(audio_manager, input_params, input_device_id), + : AudioOutputDispatcher(audio_manager, input_params, output_device_id, + input_device_id), close_delay_(close_delay), output_params_(output_params), - input_device_id_(input_device_id), streams_opened_(false) { DCHECK(input_params.IsValid()); DCHECK(output_params.IsValid()); @@ -172,7 +173,8 @@ void AudioOutputResampler::Initialize() { DCHECK(!streams_opened_); DCHECK(callbacks_.empty()); dispatcher_ = new AudioOutputDispatcherImpl( - audio_manager_, output_params_, input_device_id_, close_delay_); + audio_manager_, output_params_, output_device_id_, input_device_id_, + close_delay_); } bool AudioOutputResampler::OpenStream() { |