diff options
| author | macourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 18:36:18 +0000 |
|---|---|---|
| committer | macourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 18:36:18 +0000 |
| commit | bfda05c8bfd42c4e21825686862aa2a008c29344 (patch) | |
| tree | 117080b980aa88ee9c969d6ddce35d136052bf5d /media/audio/fake_audio_input_stream.cc | |
| parent | a5566938c4e9d644245e9bca37eeff2cdb3eb7f4 (diff) | |
| download | chromium_src-bfda05c8bfd42c4e21825686862aa2a008c29344.zip chromium_src-bfda05c8bfd42c4e21825686862aa2a008c29344.tar.gz chromium_src-bfda05c8bfd42c4e21825686862aa2a008c29344.tar.bz2 | |
Revert 277794 "Modifies AudioInputCallback::OnData and use media..."
> Modifies AudioInputCallback::OnData and use media::AudioBus instead of plain byte vector
>
> BUG=375155
> TEST=WebRTC and WebSpeech demos
>
> Review URL: https://codereview.chromium.org/314713002
R=henrika@chromium.org
TBR=henrika@chromium.org
Review URL: https://codereview.chromium.org/335343004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/fake_audio_input_stream.cc')
| -rw-r--r-- | media/audio/fake_audio_input_stream.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc index 384adcb..e05b257 100644 --- a/media/audio/fake_audio_input_stream.cc +++ b/media/audio/fake_audio_input_stream.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "media/audio/audio_manager_base.h" -#include "media/base/audio_bus.h" using base::TimeTicks; using base::TimeDelta; @@ -49,20 +48,17 @@ FakeAudioInputStream::FakeAudioInputStream(AudioManagerBase* manager, : audio_manager_(manager), callback_(NULL), buffer_size_((params.channels() * params.bits_per_sample() * - params.frames_per_buffer()) / - 8), + params.frames_per_buffer()) / 8), params_(params), thread_("FakeAudioRecordingThread"), callback_interval_(base::TimeDelta::FromMilliseconds( (params.frames_per_buffer() * 1000) / params.sample_rate())), - beep_duration_in_buffers_(kBeepDurationMilliseconds * - params.sample_rate() / - params.frames_per_buffer() / - 1000), + beep_duration_in_buffers_( + kBeepDurationMilliseconds * params.sample_rate() / + params.frames_per_buffer() / 1000), beep_generated_in_buffers_(0), beep_period_in_frames_(params.sample_rate() / kBeepFrequency), - frames_elapsed_(0), - audio_bus_(AudioBus::Create(params)) { + frames_elapsed_(0) { } FakeAudioInputStream::~FakeAudioInputStream() {} @@ -70,7 +66,6 @@ FakeAudioInputStream::~FakeAudioInputStream() {} bool FakeAudioInputStream::Open() { buffer_.reset(new uint8[buffer_size_]); memset(buffer_.get(), 0, buffer_size_); - audio_bus_->Zero(); return true; } @@ -146,9 +141,7 @@ void FakeAudioInputStream::DoCallback() { beep_generated_in_buffers_ = 0; } - audio_bus_->FromInterleaved( - buffer_.get(), audio_bus_->frames(), params_.bits_per_sample() / 8); - callback_->OnData(this, audio_bus_.get(), buffer_size_, 1.0); + callback_->OnData(this, buffer_.get(), buffer_size_, buffer_size_, 1.0); frames_elapsed_ += params_.frames_per_buffer(); thread_.message_loop()->PostDelayedTask( |