diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 16:10:48 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 16:10:48 +0000 |
| commit | c11c8c6f35a3614b43e5b75731f819f4c5f1f207 (patch) | |
| tree | 314acdfb5106a69e19feba493ae89dc7541737d9 /media/audio/win | |
| parent | 768708171bb6c8dec34509c11460d3bc355a3e81 (diff) | |
| download | chromium_src-c11c8c6f35a3614b43e5b75731f819f4c5f1f207.zip chromium_src-c11c8c6f35a3614b43e5b75731f819f4c5f1f207.tar.gz chromium_src-c11c8c6f35a3614b43e5b75731f819f4c5f1f207.tar.bz2 | |
enable folding code for 6.1 and 7.1 surround sound.
BUG=54423
TEST=audio unittest and http://fbarchard0-w.ad.corp.google.com/testmatrix/gromit/gromit8.webm
Review URL: http://codereview.chromium.org/3353022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/win')
| -rw-r--r-- | media/audio/win/audio_manager_win.cc | 6 | ||||
| -rw-r--r-- | media/audio/win/waveout_output_win.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc index 2e65879..3d5c137 100644 --- a/media/audio/win/audio_manager_win.cc +++ b/media/audio/win/audio_manager_win.cc @@ -17,12 +17,10 @@ namespace { -// Up to 6 channels can be passed to the driver. +// Up to 8 channels can be passed to the driver. // This should work, given the right drivers, but graceful error handling is // needed. -// In theory 7.1 could also be supported, but it has not been tested. -// TODO(sergeyu): Test that 7.1 audio works. -const int kWinMaxChannels = 6; +const int kWinMaxChannels = 8; const int kWinMaxInputChannels = 2; const int kMaxSamplesPerPacket = media::Limits::kMaxSampleRate; diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h index 7b87e4e..7bee81e 100644 --- a/media/audio/win/waveout_output_win.h +++ b/media/audio/win/waveout_output_win.h @@ -89,7 +89,7 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream { // Volume level from 0 to 1. float volume_; - // Channels from 0 to 6. + // Channels from 0 to 8. const int channels_; // Number of bytes yet to be played in the hardware buffer. |