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

Unified Diff: media/audio/fake_audio_output_stream.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/fake_audio_output_stream.h ('k') | media/audio/linux/alsa_output.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/fake_audio_output_stream.cc
diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc
index aaa6158ed46c8e8364fe25885e6427e829903ec4..f09fe5dd5de4beab625c80422a07d0b27c902174 100644
--- a/media/audio/fake_audio_output_stream.cc
+++ b/media/audio/fake_audio_output_stream.cc
@@ -24,9 +24,6 @@ AudioOutputStream* FakeAudioOutputStream::MakeFakeStream(
}
bool FakeAudioOutputStream::Open() {
- if (bytes_per_buffer_ < sizeof(int16))
- return false;
- buffer_.reset(new uint8[bytes_per_buffer_]);
return true;
}
@@ -37,9 +34,8 @@ FakeAudioOutputStream* FakeAudioOutputStream::GetCurrentFakeStream() {
void FakeAudioOutputStream::Start(AudioSourceCallback* callback) {
callback_ = callback;
- memset(buffer_.get(), 0, bytes_per_buffer_);
- callback_->OnMoreData(buffer_.get(), bytes_per_buffer_,
- AudioBuffersState(0, 0));
+ audio_bus_->Zero();
+ callback_->OnMoreData(audio_bus_.get(), AudioBuffersState(0, 0));
}
void FakeAudioOutputStream::Stop() {
@@ -64,8 +60,8 @@ FakeAudioOutputStream::FakeAudioOutputStream(AudioManagerBase* manager,
: audio_manager_(manager),
volume_(0),
callback_(NULL),
- bytes_per_buffer_(params.GetBytesPerBuffer()),
closed_(false) {
+ audio_bus_ = AudioBus::Create(params);
}
FakeAudioOutputStream::~FakeAudioOutputStream() {
« no previous file with comments | « media/audio/fake_audio_output_stream.h ('k') | media/audio/linux/alsa_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698