diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 21:28:49 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 21:28:49 +0000 |
| commit | 48329446603c155f1b0c5394ac6c993e22e8af1c (patch) | |
| tree | 4e8482817835a1727b5717dbad7c73d08d816232 /media/audio/fake_audio_manager.cc | |
| parent | 7ac2109a61fa55e6d83c9853947525be204cefdc (diff) | |
| download | chromium_src-48329446603c155f1b0c5394ac6c993e22e8af1c.zip chromium_src-48329446603c155f1b0c5394ac6c993e22e8af1c.tar.gz chromium_src-48329446603c155f1b0c5394ac6c993e22e8af1c.tar.bz2 | |
Fix media tests in content_browsertests when use_alsa=0
Tests fail when calling GetInputStreamParameters in AudioManagerBase due to NOTREACHED in
the function. Override the function in FakeAudioManager and return a valid AudioParameters value.
BUG=315392
Review URL: https://codereview.chromium.org/96903005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/fake_audio_manager.cc')
| -rw-r--r-- | media/audio/fake_audio_manager.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/media/audio/fake_audio_manager.cc b/media/audio/fake_audio_manager.cc index dc005da..c092ad6 100644 --- a/media/audio/fake_audio_manager.cc +++ b/media/audio/fake_audio_manager.cc @@ -6,6 +6,13 @@ namespace media { +namespace { + +const int kDefaultInputBufferSize = 1024; +const int kDefaultSampleRate = 48000; + +} // namespace + FakeAudioManager::FakeAudioManager(AudioLogFactory* audio_log_factory) : AudioManagerBase(audio_log_factory) {} @@ -66,4 +73,11 @@ AudioParameters FakeAudioManager::GetPreferredOutputStreamParameters( sample_rate, bits_per_sample, buffer_size); } +AudioParameters FakeAudioManager::GetInputStreamParameters( + const std::string& device_id) { + return AudioParameters( + AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, + kDefaultSampleRate, 16, kDefaultInputBufferSize); +} + } // namespace media |