| Index: media/audio/win/audio_manager_win.cc
|
| diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
|
| index 4a3b0083e8f58aa1f82fc8f0d7062c98bd6da467..7ef9a8470cdf86ddde7b45ac7eb9d6d25da18a6a 100644
|
| --- a/media/audio/win/audio_manager_win.cc
|
| +++ b/media/audio/win/audio_manager_win.cc
|
| @@ -317,17 +317,14 @@ AudioParameters AudioManagerWin::GetInputStreamParameters(
|
|
|
| if (FAILED(hr) || !parameters.IsValid()) {
|
| // Windows Wave implementation is being used.
|
| - parameters = AudioParameters(
|
| - AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, 48000, 16,
|
| - kFallbackBufferSize, AudioParameters::NO_EFFECTS);
|
| + parameters =
|
| + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
|
| + CHANNEL_LAYOUT_STEREO, 48000, 16, kFallbackBufferSize);
|
| }
|
|
|
| int user_buffer_size = GetUserBufferSize();
|
| - if (user_buffer_size) {
|
| - parameters.Reset(parameters.format(), parameters.channel_layout(),
|
| - parameters.channels(), parameters.sample_rate(),
|
| - parameters.bits_per_sample(), user_buffer_size);
|
| - }
|
| + if (user_buffer_size)
|
| + parameters.set_frames_per_buffer(user_buffer_size);
|
|
|
| return parameters;
|
| }
|
| @@ -517,9 +514,10 @@ AudioParameters AudioManagerWin::GetPreferredOutputStreamParameters(
|
| if (user_buffer_size)
|
| buffer_size = user_buffer_size;
|
|
|
| - return AudioParameters(
|
| - AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
|
| - sample_rate, bits_per_sample, buffer_size, effects);
|
| + AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
|
| + sample_rate, bits_per_sample, buffer_size);
|
| + params.set_effects(effects);
|
| + return params;
|
| }
|
|
|
| AudioInputStream* AudioManagerWin::CreatePCMWaveInAudioInputStream(
|
|
|