diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 21:49:12 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 21:49:12 +0000 |
| commit | 83337270c01c66378d443f5c3d15926cac164747 (patch) | |
| tree | a94d2b86aa74a0fa15a5f9404f4abc6c7cc725e4 /media/media.gyp | |
| parent | cdf6cc8f2b5036894359123804d28b92b9cfa9ee (diff) | |
| download | chromium_src-83337270c01c66378d443f5c3d15926cac164747.zip chromium_src-83337270c01c66378d443f5c3d15926cac164747.tar.gz chromium_src-83337270c01c66378d443f5c3d15926cac164747.tar.bz2 | |
Reimplement the AlsaPcmOutputStream and fix the threading issues.
Changes the threading model from one thread per stream to one shared thread. Also, redoes the alsa reading/buffering logic to assume an asynchronous data source, and respect the different packet sizes. The Alsa device is set to non-blocking now. State transitions are cleaned up, and the threading semantics are reworked. Now linux audio will no longer crash on shutdown, seek, pause, or tab close. This implementation does still leak though. :( The leak will be fixed in another CL.
Review URL: http://codereview.chromium.org/160497
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index f725862..9599890 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -38,6 +38,8 @@ 'audio/linux/audio_manager_linux.h', 'audio/linux/alsa_output.cc', 'audio/linux/alsa_output.h', + 'audio/linux/alsa_wrapper.cc', + 'audio/linux/alsa_wrapper.h', 'audio/mac/audio_manager_mac.cc', 'audio/mac/audio_manager_mac.h', 'audio/mac/audio_output_mac.cc', @@ -153,6 +155,7 @@ ], 'sources': [ 'audio/audio_util_unittest.cc', + 'audio/linux/alsa_output_unittest.cc', 'audio/mac/audio_output_mac_unittest.cc', 'audio/simple_sources_unittest.cc', 'audio/win/audio_output_win_unittest.cc', |