Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: media/audio/win/waveout_output_win.h

Issue 10832285: Switch OnMoreData() to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Comments. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/audio/win/audio_output_win_unittest.cc ('k') | media/audio/win/waveout_output_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_ 5 #ifndef MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_
6 #define MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_ 6 #define MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <mmsystem.h> 9 #include <mmsystem.h>
10 #include <mmreg.h> 10 #include <mmreg.h>
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // Handle returned by RegisterWaitForSingleObject(). 123 // Handle returned by RegisterWaitForSingleObject().
124 HANDLE waiting_handle_; 124 HANDLE waiting_handle_;
125 125
126 // Pointer to the allocated audio buffers, we allocate all buffers in one big 126 // Pointer to the allocated audio buffers, we allocate all buffers in one big
127 // chunk. This object owns them. 127 // chunk. This object owns them.
128 scoped_array<char> buffers_; 128 scoped_array<char> buffers_;
129 129
130 // Lock used to avoid the conflict when callbacks are called simultaneously. 130 // Lock used to avoid the conflict when callbacks are called simultaneously.
131 base::Lock lock_; 131 base::Lock lock_;
132 132
133 // Container for retrieving data from AudioSourceCallback::OnMoreData().
134 scoped_ptr<AudioBus> audio_bus_;
135
133 DISALLOW_COPY_AND_ASSIGN(PCMWaveOutAudioOutputStream); 136 DISALLOW_COPY_AND_ASSIGN(PCMWaveOutAudioOutputStream);
134 }; 137 };
135 138
136 } // namespace media 139 } // namespace media
137 140
138 #endif // MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_ 141 #endif // MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_
OLDNEW
« no previous file with comments | « media/audio/win/audio_output_win_unittest.cc ('k') | media/audio/win/waveout_output_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698