| Index: media/audio/fake_audio_input_stream.cc
|
| diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc
|
| index 52d7218d2870da974913803fe97a1989f290f4e3..90c427d54ff8368b6d633b05bb12b7feefb93a82 100644
|
| --- a/media/audio/fake_audio_input_stream.cc
|
| +++ b/media/audio/fake_audio_input_stream.cc
|
| @@ -12,7 +12,6 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/time/time.h"
|
| -#include "media/audio/audio_manager_base.h"
|
| #include "media/audio/simple_sources.h"
|
| #include "media/base/audio_bus.h"
|
| #include "media/base/media_switches.h"
|
| @@ -20,67 +19,73 @@
|
| namespace media {
|
|
|
| AudioInputStream* FakeAudioInputStream::MakeFakeStream(
|
| - AudioManagerBase* manager,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& audio_task_runner,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
|
| const AudioParameters& params) {
|
| - return new FakeAudioInputStream(manager, params);
|
| -}
|
| -
|
| -FakeAudioInputStream::FakeAudioInputStream(AudioManagerBase* manager,
|
| - const AudioParameters& params)
|
| - : audio_manager_(manager),
|
| - callback_(NULL),
|
| - fake_audio_worker_(manager->GetWorkerTaskRunner(), params),
|
| + return new FakeAudioInputStream(audio_task_runner, worker_task_runner,
|
| + params);
|
| +}
|
| +
|
| +FakeAudioInputStream::FakeAudioInputStream(
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& audio_task_runner,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
|
| + const AudioParameters& params)
|
| + : callback_(NULL),
|
| + fake_audio_worker_(worker_task_runner, params),
|
| + audio_task_runner_(audio_task_runner),
|
| + worker_task_runner_(worker_task_runner),
|
| params_(params),
|
| audio_bus_(AudioBus::Create(params)) {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| }
|
|
|
| FakeAudioInputStream::~FakeAudioInputStream() {
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| DCHECK(!callback_);
|
| }
|
|
|
| bool FakeAudioInputStream::Open() {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| audio_bus_->Zero();
|
|
|
| return true;
|
| }
|
|
|
| void FakeAudioInputStream::Start(AudioInputCallback* callback) {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| callback_ = callback;
|
| fake_audio_worker_.Start(base::Bind(
|
| &FakeAudioInputStream::ReadAudioFromSource, base::Unretained(this)));
|
| }
|
|
|
| void FakeAudioInputStream::Stop() {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| fake_audio_worker_.Stop();
|
| callback_ = NULL;
|
| }
|
|
|
| void FakeAudioInputStream::Close() {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| DCHECK(!callback_);
|
| - audio_manager_->ReleaseInputStream(this);
|
| + delete this;
|
| }
|
|
|
| double FakeAudioInputStream::GetMaxVolume() {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| return 1.0;
|
| }
|
|
|
| void FakeAudioInputStream::SetVolume(double volume) {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| }
|
|
|
| double FakeAudioInputStream::GetVolume() {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| return 1.0;
|
| }
|
|
|
| bool FakeAudioInputStream::IsMuted() {
|
| - DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(audio_task_runner_->BelongsToCurrentThread());
|
| return false;
|
| }
|
|
|
| @@ -93,7 +98,7 @@ bool FakeAudioInputStream::GetAutomaticGainControl() {
|
| }
|
|
|
| void FakeAudioInputStream::ReadAudioFromSource() {
|
| - DCHECK(audio_manager_->GetWorkerTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(worker_task_runner_->BelongsToCurrentThread());
|
| DCHECK(callback_);
|
|
|
| if (!audio_source_)
|
| @@ -106,7 +111,7 @@ void FakeAudioInputStream::ReadAudioFromSource() {
|
|
|
| using AudioSourceCallback = AudioOutputStream::AudioSourceCallback;
|
| std::unique_ptr<AudioSourceCallback> FakeAudioInputStream::ChooseSource() {
|
| - DCHECK(audio_manager_->GetWorkerTaskRunner()->BelongsToCurrentThread());
|
| + DCHECK(worker_task_runner_->BelongsToCurrentThread());
|
|
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kUseFileForFakeAudioCapture)) {
|
|
|