| 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 67bc7a901f5b84e83fb5f130c371874dec415cae..89e9eab41d51cb260ae8dfecf65263fed14e7cc0 100644
|
| --- a/media/audio/win/audio_manager_win.cc
|
| +++ b/media/audio/win/audio_manager_win.cc
|
| @@ -335,7 +335,8 @@ std::string AudioManagerWin::GetAssociatedOutputDeviceID(
|
| // mode.
|
| // - PCMWaveOutAudioOutputStream: Based on the waveOut API.
|
| AudioOutputStream* AudioManagerWin::MakeLinearOutputStream(
|
| - const AudioParameters& params) {
|
| + const AudioParameters& params,
|
| + const LogCallback& log_callback) {
|
| DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
| if (params.channels() > kWinMaxChannels)
|
| return NULL;
|
| @@ -353,7 +354,8 @@ AudioOutputStream* AudioManagerWin::MakeLinearOutputStream(
|
| // - WASAPIAudioOutputStream: Based on Core Audio (WASAPI) API.
|
| AudioOutputStream* AudioManagerWin::MakeLowLatencyOutputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id) {
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) {
|
| DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
| if (params.channels() > kWinMaxChannels)
|
| return NULL;
|
| @@ -384,7 +386,9 @@ AudioOutputStream* AudioManagerWin::MakeLowLatencyOutputStream(
|
| // Factory for the implementations of AudioInputStream for AUDIO_PCM_LINEAR
|
| // mode.
|
| AudioInputStream* AudioManagerWin::MakeLinearInputStream(
|
| - const AudioParameters& params, const std::string& device_id) {
|
| + const AudioParameters& params,
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) {
|
| DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
| return CreatePCMWaveInAudioInputStream(params, device_id);
|
| }
|
| @@ -392,7 +396,9 @@ AudioInputStream* AudioManagerWin::MakeLinearInputStream(
|
| // Factory for the implementations of AudioInputStream for
|
| // AUDIO_PCM_LOW_LATENCY mode.
|
| AudioInputStream* AudioManagerWin::MakeLowLatencyInputStream(
|
| - const AudioParameters& params, const std::string& device_id) {
|
| + const AudioParameters& params,
|
| + const std::string& device_id,
|
| + const LogCallback& log_callback) {
|
| DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
| DVLOG(1) << "MakeLowLatencyInputStream: " << device_id;
|
| AudioInputStream* stream = NULL;
|
|
|