Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/audio/win/audio_output_win_unittest.cc

Issue 9691001: Audio software mixer. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/audio/audio_parameters.h ('K') | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/base/media_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/audio_output_win_unittest.cc
===================================================================
--- media/audio/win/audio_output_win_unittest.cc (revision 128216)
+++ media/audio/win/audio_output_win_unittest.cc (working copy)
@@ -197,8 +197,8 @@
TEST(WinAudioTest, MockStreamBasicCallbacks) {
scoped_ptr<AudioManager> audio_man(AudioManager::Create());
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_MOCK, CHANNEL_LAYOUT_STEREO, 8000,
- 8, 128));
+ AudioParameters(AudioParameters::AUDIO_MOCK, false,
+ CHANNEL_LAYOUT_STEREO, 8000, 8, 128));
ASSERT_TRUE(NULL != oas);
EXPECT_TRUE(oas->Open());
TestSourceBasic source;
@@ -226,8 +226,8 @@
}
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
- 8000, 16, 256));
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
+ CHANNEL_LAYOUT_STEREO, 8000, 16, 256));
ASSERT_TRUE(NULL != oas);
oas->Close();
}
@@ -242,21 +242,21 @@
AudioParameters::Format fmt = AudioParameters::AUDIO_PCM_LINEAR;
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_UNSUPPORTED, 8000, 16, 256)));
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_UNSUPPORTED, 8000, 16, 256)));
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 1024 * 1024, 16, 256)));
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_MONO, 1024 * 1024, 16, 256)));
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_STEREO, 8000, 80, 256)));
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_STEREO, 8000, 80, 256)));
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_UNSUPPORTED, 8000, 16, 256)));
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_UNSUPPORTED, 8000, 16, 256)));
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_STEREO, -8000, 16, 256)));
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_STEREO, -8000, 16, 256)));
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16, -100)));
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_MONO, 8000, 16, -100)));
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16, 0)));
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_MONO, 8000, 16, 0)));
EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream(
- AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16,
+ AudioParameters(fmt, false, CHANNEL_LAYOUT_MONO, 8000, 16,
media::limits::kMaxSamplesPerPacket + 1)));
}
@@ -269,8 +269,8 @@
}
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
- 8000, 16, 256));
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
+ CHANNEL_LAYOUT_STEREO, 8000, 16, 256));
ASSERT_TRUE(NULL != oas);
EXPECT_TRUE(oas->Open());
oas->Close();
@@ -285,8 +285,8 @@
}
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
- 8000, 16, 1024 * 1024 * 1024));
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
+ CHANNEL_LAYOUT_STEREO, 8000, 16, 1024 * 1024 * 1024));
EXPECT_TRUE(NULL == oas);
if (oas)
oas->Close();
@@ -302,8 +302,8 @@
}
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
- 16000, 16, 256));
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
+ CHANNEL_LAYOUT_MONO, 16000, 16, 256));
ASSERT_TRUE(NULL != oas);
TestSourceTripleBuffer test_triple_buffer;
EXPECT_TRUE(oas->Open());
@@ -327,8 +327,8 @@
}
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
- 16000, 16, 256));
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
+ CHANNEL_LAYOUT_MONO, 16000, 16, 256));
ASSERT_TRUE(NULL != oas);
TestSourceLaggy test_laggy(2, 90);
EXPECT_TRUE(oas->Open());
@@ -355,7 +355,8 @@
uint32 samples_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, samples_100_ms));
ASSERT_TRUE(NULL != oas);
@@ -386,7 +387,8 @@
uint32 samples_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, samples_100_ms));
ASSERT_TRUE(NULL != oas);
@@ -414,7 +416,8 @@
uint32 samples_100_ms = AudioParameters::kAudioCDSampleRate / 20;
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,
samples_100_ms));
ASSERT_TRUE(NULL != oas);
@@ -464,7 +467,8 @@
const uint32 kSize100ms = kSamples100ms * 2;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
+ CHANNEL_LAYOUT_MONO,
16000, 16, kSamples100ms));
ASSERT_TRUE(NULL != oas);
@@ -508,7 +512,8 @@
uint32 samples_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, samples_100_ms));
ASSERT_TRUE(NULL != oas);
@@ -554,7 +559,7 @@
(base::win::GetVersion() <= base::win::VERSION_XP) ? n = 5 : n = 1;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
- CHANNEL_LAYOUT_MONO, sample_rate,
+ false, CHANNEL_LAYOUT_MONO, sample_rate,
16, n * samples_10_ms));
ASSERT_TRUE(NULL != oas);
@@ -588,7 +593,8 @@
uint32 samples_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, samples_100_ms));
ASSERT_TRUE(NULL != oas);
@@ -716,7 +722,7 @@
int sample_rate = AudioParameters::kAudioCDSampleRate;
const uint32 kSamples20ms = sample_rate / 50;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
- AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
+ AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, false,
CHANNEL_LAYOUT_MONO, sample_rate, 16, kSamples20ms));
ASSERT_TRUE(NULL != oas);
« media/audio/audio_parameters.h ('K') | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698