diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 23:40:48 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 23:40:48 +0000 |
| commit | 0cc807f110174373f80eeafc061c3370054f145d (patch) | |
| tree | c3895dc3ca00497c8674c9cc6165be1948ff8b1f /media/audio | |
| parent | 5fff0ae077169d02d0e0d37d5c4019379ccca1c9 (diff) | |
| download | chromium_src-0cc807f110174373f80eeafc061c3370054f145d.zip chromium_src-0cc807f110174373f80eeafc061c3370054f145d.tar.gz chromium_src-0cc807f110174373f80eeafc061c3370054f145d.tar.bz2 | |
Revert 130765 - alsa_output: Bounds check snd_pcm_avail_update.
Buggy ALSA drivers can at times return very large values from snd_pcm_avail_update. There should never be more available frames than total frames in the buffer.
Patch by dgreid@chromium.org:
http://codereview.chromium.org/9963043/
BUG=chromium-os:26151
TEST=Manual, run a flash player looping alongside an aplay stress test and check that the flash video continues to output audio.
TBR=scherkus@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9996001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
| -rw-r--r-- | media/audio/linux/alsa_output.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc index f8f8d57..d940be9 100644 --- a/media/audio/linux/alsa_output.cc +++ b/media/audio/linux/alsa_output.cc @@ -661,11 +661,6 @@ snd_pcm_sframes_t AlsaPcmOutputStream::GetAvailableFrames() { << wrapper_->StrError(available_frames); return 0; } - if (available_frames > alsa_buffer_frames_) { - LOG(ERROR) << "ALSA returned " << available_frames << " of " - << alsa_buffer_frames_ << " frames available."; - return alsa_buffer_frames_; - } return available_frames; } |