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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Made ResourceContext::audio_manager() abide the same rules as other accessors Created 9 years 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/win/audio_low_latency_input_win_unittest.cc ('K') | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/filters/reference_audio_renderer.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 113173)
+++ media/audio/win/audio_output_win_unittest.cc (working copy)
@@ -199,8 +199,7 @@
// ============================================================================
// Validate that the AudioManager::AUDIO_MOCK callbacks work.
TEST(WinAudioTest, MockStreamBasicCallbacks) {
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
AudioParameters(AudioParameters::AUDIO_MOCK, CHANNEL_LAYOUT_STEREO, 8000,
8, 128));
@@ -226,8 +225,7 @@
TEST(WinAudioTest, PCMWaveStreamGetAndClose) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
@@ -241,8 +239,7 @@
TEST(WinAudioTest, SanityOnMakeParams) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioParameters::Format fmt = AudioParameters::AUDIO_PCM_LINEAR;
@@ -269,8 +266,7 @@
TEST(WinAudioTest, PCMWaveStreamOpenAndClose) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
@@ -285,8 +281,7 @@
TEST(WinAudioTest, PCMWaveStreamOpenLimit) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
@@ -302,8 +297,7 @@
TEST(WinAudioTest, PCMWaveStreamTripleBuffer) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
@@ -327,8 +321,7 @@
TEST(WinAudioTest, PCMWaveSlowSource) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
@@ -354,8 +347,7 @@
TEST(WinAudioTest, PCMWaveStreamPlaySlowLoop) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
uint32 samples_100_ms = AudioParameters::kAudioCDSampleRate / 10;
@@ -385,8 +377,7 @@
TEST(WinAudioTest, PCMWaveStreamPlay200HzTone44Kss) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
uint32 samples_100_ms = AudioParameters::kAudioCDSampleRate / 10;
@@ -413,8 +404,7 @@
TEST(WinAudioTest, PCMWaveStreamPlay200HzTone22Kss) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
uint32 samples_100_ms = AudioParameters::kAudioCDSampleRate / 20;
@@ -460,8 +450,7 @@
ReadOnlyMappedFile file_reader(audio_file.value().c_str());
ASSERT_TRUE(file_reader.is_valid());
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
@@ -508,8 +497,7 @@
TEST(WinAudioTest, PCMWaveStreamPlayTwice200HzTone44Kss) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
@@ -546,8 +534,7 @@
TEST(WinAudioTest, PCMWaveStreamPlay200HzToneLowLatency) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
@@ -569,13 +556,17 @@
SineWaveAudioSource source(SineWaveAudioSource::FORMAT_16BIT_LINEAR_PCM, 1,
200.0, sample_rate);
- EXPECT_TRUE(oas->Open());
- oas->SetVolume(1.0);
- // Play the wave for .8 seconds.
- oas->Start(&source);
- ::Sleep(800);
- oas->Stop();
+ bool opened;
+ EXPECT_TRUE(opened = oas->Open());
scherkus (not reviewing) 2011/12/09 22:47:30 ASSERT_TRUE(oas->Open())? would do away w/ opened
tommi (sloooow) - chröme 2011/12/10 00:11:14 We still need to call Close(), but I've fixed this
+ if (opened) {
+ oas->SetVolume(1.0);
+
+ // Play the wave for .8 seconds.
+ oas->Start(&source);
+ ::Sleep(800);
+ oas->Stop();
+ }
oas->Close();
}
@@ -583,8 +574,7 @@
TEST(WinAudioTest, PCMWaveStreamPendingBytes) {
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
@@ -681,7 +671,7 @@
SyncThreadContext& ctx = *(reinterpret_cast<SyncThreadContext*>(context));
const int kTwoSecBytes =
- AudioParameters::kAudioCDSampleRate * 2 * sizeof(uint16);
+ AudioParameters::kAudioCDSampleRate * 2 * sizeof(uint16); // NOLINT
uint8* buffer = new uint8[kTwoSecBytes];
SineWaveAudioSource sine(SineWaveAudioSource::FORMAT_16BIT_LINEAR_PCM,
1, ctx.sine_freq, ctx.sample_rate);
@@ -713,8 +703,7 @@
if (IsRunningHeadless())
return;
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
+ scoped_refptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
« media/audio/win/audio_low_latency_input_win_unittest.cc ('K') | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/filters/reference_audio_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698