| Index: content/renderer/media/audio_renderer_mixer_manager_unittest.cc
|
| diff --git a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
|
| index 8ef3738fd959ee138571669bb9d87c96a912096d..b8a6759ecff0461942073a0db65eefbed32b3020 100644
|
| --- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
|
| +++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
|
| @@ -626,16 +626,10 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLatencyPlayback) {
|
| // Expecting hardware sample rate
|
| EXPECT_EQ(44100, mixer->GetOutputParamsForTesting().sample_rate());
|
|
|
| -// 20 ms at 44100 is 882 frames per buffer.
|
| -#if defined(OS_WIN)
|
| + // 20 ms at 44100 is 882 frames per buffer.
|
| // Round up 882 to the nearest multiple of the output buffer size (128). which
|
| // is 7 * 128 = 896
|
| EXPECT_EQ(896, mixer->GetOutputParamsForTesting().frames_per_buffer());
|
| -#else
|
| - // Round up 882 to the power of 2.
|
| - EXPECT_EQ(1024, mixer->GetOutputParamsForTesting().frames_per_buffer());
|
| -#endif // defined(OS_WIN)
|
| -
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| ReturnMixer(mixer);
|
| @@ -699,14 +693,9 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLatencyPlaybackFakeAudio) {
|
| // Expecting input sample rate
|
| EXPECT_EQ(32000, mixer->GetOutputParamsForTesting().sample_rate());
|
|
|
| -// 20 ms at 32000 is 640 frames per buffer.
|
| -#if defined(OS_WIN)
|
| + // 20 ms at 32000 is 640 frames per buffer.
|
| // Use 20 ms buffer.
|
| EXPECT_EQ(640, mixer->GetOutputParamsForTesting().frames_per_buffer());
|
| -#else
|
| - // Ignore device buffer size, round up 640 to the power of 2.
|
| - EXPECT_EQ(1024, mixer->GetOutputParamsForTesting().frames_per_buffer());
|
| -#endif // defined(OS_WIN)
|
|
|
| ReturnMixer(mixer);
|
| }
|
|
|