Index: media/audio/win/audio_output_win_unittest.cc |
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc |
index 55304c98de6f068b6fce5a3ad6989a99695d4e9f..fe9bfdfbaa69dd5a8cadb61d366743f595ed9352 100644 |
--- a/media/audio/win/audio_output_win_unittest.cc |
+++ b/media/audio/win/audio_output_win_unittest.cc |
@@ -178,7 +178,7 @@ TEST_F(WinAudioTest, PCMWaveStreamGetAndClose) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
8000, 16, 256), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
oas->Close(); |
} |
@@ -192,38 +192,38 @@ TEST_F(WinAudioTest, SanityOnMakeParams) { |
NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_UNSUPPORTED, 8000, 16, 256), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
EXPECT_TRUE( |
NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 1024 * 1024, 16, 256), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
EXPECT_TRUE(NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_STEREO, 8000, 80, 256), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
EXPECT_TRUE( |
NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_UNSUPPORTED, 8000, 16, 256), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
EXPECT_TRUE(NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_STEREO, -8000, 16, 256), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
EXPECT_TRUE(NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16, -100), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
EXPECT_TRUE(NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16, 0), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
EXPECT_TRUE(NULL == |
audio_manager_->MakeAudioOutputStream( |
AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16, |
media::limits::kMaxSamplesPerPacket + 1), |
- std::string())); |
+ std::string(), AudioManager::LogCallback())); |
} |
// Test that it can be opened and closed. |
@@ -233,7 +233,7 @@ TEST_F(WinAudioTest, PCMWaveStreamOpenAndClose) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
8000, 16, 256), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
EXPECT_TRUE(oas->Open()); |
oas->Close(); |
@@ -246,7 +246,7 @@ TEST_F(WinAudioTest, PCMWaveStreamOpenLimit) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, |
8000, 16, 1024 * 1024 * 1024), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
EXPECT_TRUE(NULL == oas); |
if (oas) |
oas->Close(); |
@@ -261,7 +261,7 @@ TEST_F(WinAudioTest, PCMWaveSlowSource) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
16000, 16, 256), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
TestSourceLaggy test_laggy(90); |
EXPECT_TRUE(oas->Open()); |
@@ -286,7 +286,7 @@ TEST_F(WinAudioTest, PCMWaveStreamPlaySlowLoop) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
AudioParameters::kAudioCDSampleRate, 16, samples_100_ms), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
SineWaveAudioSource source(1, 200.0, AudioParameters::kAudioCDSampleRate); |
@@ -316,7 +316,7 @@ TEST_F(WinAudioTest, PCMWaveStreamPlay200HzTone44Kss) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
AudioParameters::kAudioCDSampleRate, 16, samples_100_ms), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
SineWaveAudioSource source(1, 200.0, AudioParameters::kAudioCDSampleRate); |
@@ -341,7 +341,7 @@ TEST_F(WinAudioTest, PCMWaveStreamPlay200HzTone22Kss) { |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
AudioParameters::kAudioCDSampleRate / 2, 16, |
samples_100_ms), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
SineWaveAudioSource source(1, 200.0, AudioParameters::kAudioCDSampleRate/2); |
@@ -377,7 +377,7 @@ TEST_F(WinAudioTest, PushSourceFile16KHz) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
kSampleRate, 16, kSamples100ms), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
EXPECT_TRUE(oas->Open()); |
@@ -410,7 +410,7 @@ TEST_F(WinAudioTest, PCMWaveStreamPlayTwice200HzTone44Kss) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
AudioParameters::kAudioCDSampleRate, 16, samples_100_ms), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
SineWaveAudioSource source(1, 200.0, AudioParameters::kAudioCDSampleRate); |
@@ -450,7 +450,7 @@ TEST_F(WinAudioTest, PCMWaveStreamPlay200HzToneLowLatency) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
CHANNEL_LAYOUT_MONO, sample_rate, 16, n * samples_10_ms), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
SineWaveAudioSource source(1, 200, sample_rate); |
@@ -480,7 +480,7 @@ TEST_F(WinAudioTest, PCMWaveStreamPendingBytes) { |
AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, |
AudioParameters::kAudioCDSampleRate, 16, samples_100_ms), |
- std::string()); |
+ std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
NiceMock<MockAudioSourceCallback> source; |
@@ -612,8 +612,8 @@ TEST_F(WinAudioTest, SyncSocketBasic) { |
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, |
CHANNEL_LAYOUT_MONO, sample_rate, 16, kSamples20ms); |
- AudioOutputStream* oas = |
- audio_manager_->MakeAudioOutputStream(params, std::string()); |
+ AudioOutputStream* oas = audio_manager_->MakeAudioOutputStream( |
+ params, std::string(), AudioManager::LogCallback()); |
ASSERT_TRUE(NULL != oas); |
ASSERT_TRUE(oas->Open()); |