diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 03:07:19 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 03:07:19 +0000 |
| commit | 9ade381f46175dead00a1cc9ffc3328230e8c982 (patch) | |
| tree | 64c6caf04643408b2e25bce192f03c9b7b93eaa2 /media/audio/win/wavein_input_win.cc | |
| parent | adc19c0eeac9f3caaae4e35bd64e79e6b6e72a0f (diff) | |
| download | chromium_src-9ade381f46175dead00a1cc9ffc3328230e8c982.zip chromium_src-9ade381f46175dead00a1cc9ffc3328230e8c982.tar.gz chromium_src-9ade381f46175dead00a1cc9ffc3328230e8c982.tar.bz2 | |
Simplified AudioOutputStream interface.
1. Removed packet_size parameter from Open().
2. Removed OnClose() from the callback. Now the callback is guaranteed to be called only between Start() and Stop().
3. Added samples_per_packet in the AudioParameters struct.
BUG=39825
TEST=Unittests
Review URL: http://codereview.chromium.org/4661001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/win/wavein_input_win.cc')
| -rw-r--r-- | media/audio/win/wavein_input_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/win/wavein_input_win.cc b/media/audio/win/wavein_input_win.cc index b328dcd..c02fd52 100644 --- a/media/audio/win/wavein_input_win.cc +++ b/media/audio/win/wavein_input_win.cc @@ -26,7 +26,7 @@ WAVEHDR* GetNextBuffer(WAVEHDR* current) { PCMWaveInAudioInputStream::PCMWaveInAudioInputStream( AudioManagerWin* manager, AudioParameters params, int num_buffers, - uint32 samples_per_packet, UINT device_id) + UINT device_id) : state_(kStateEmpty), manager_(manager), device_id_(device_id), @@ -42,7 +42,7 @@ PCMWaveInAudioInputStream::PCMWaveInAudioInputStream( format_.cbSize = 0; format_.nBlockAlign = (format_.nChannels * format_.wBitsPerSample) / 8; format_.nAvgBytesPerSec = format_.nBlockAlign * format_.nSamplesPerSec; - buffer_size_ = samples_per_packet * format_.nBlockAlign; + buffer_size_ = params.samples_per_packet * format_.nBlockAlign; // If we don't have a packet size we use 100ms. if (!buffer_size_) buffer_size_ = format_.nAvgBytesPerSec / 10; |