| Index: media/audio/mac/audio_output_mac_unittest.cc
|
| ===================================================================
|
| --- media/audio/mac/audio_output_mac_unittest.cc (revision 128216)
|
| +++ media/audio/mac/audio_output_mac_unittest.cc (working copy)
|
| @@ -55,7 +55,8 @@
|
| if (!audio_man->HasAudioOutputDevices())
|
| return;
|
| AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
|
| - AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
|
| + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
|
| + CHANNEL_LAYOUT_STEREO,
|
| 8000, 16, 1024));
|
| ASSERT_TRUE(NULL != oas);
|
| oas->Close();
|
| @@ -67,7 +68,8 @@
|
| if (!audio_man->HasAudioOutputDevices())
|
| return;
|
| AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
|
| - AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
|
| + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
|
| + CHANNEL_LAYOUT_STEREO,
|
| 8000, 16, 1024));
|
| ASSERT_TRUE(NULL != oas);
|
| EXPECT_TRUE(oas->Open());
|
| @@ -84,7 +86,8 @@
|
| return;
|
| uint32 frames_100_ms = AudioParameters::kAudioCDSampleRate / 10;
|
| AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
|
| - AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
|
| + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
|
| + CHANNEL_LAYOUT_MONO,
|
| AudioParameters::kAudioCDSampleRate, 16, frames_100_ms));
|
| ASSERT_TRUE(NULL != oas);
|
| EXPECT_TRUE(oas->Open());
|
| @@ -114,7 +117,8 @@
|
| return;
|
| uint32 frames_100_ms = AudioParameters::kAudioCDSampleRate / 10;
|
| AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
|
| - AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
|
| + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
|
| + CHANNEL_LAYOUT_MONO,
|
| AudioParameters::kAudioCDSampleRate / 2, 16,
|
| frames_100_ms));
|
| ASSERT_TRUE(NULL != oas);
|
| @@ -141,7 +145,8 @@
|
|
|
| uint32 frames_100_ms = AudioParameters::kAudioCDSampleRate / 10;
|
| AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
|
| - AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
|
| + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
|
| + CHANNEL_LAYOUT_MONO,
|
| AudioParameters::kAudioCDSampleRate, 16, frames_100_ms));
|
| ASSERT_TRUE(NULL != oas);
|
|
|
|
|