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

Unified Diff: media/audio/fake_audio_output_stream.cc

Issue 2507643002: Removes tracking for fake audio streams. (Closed)
Patch Set: Created 4 years, 1 month 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') | no next file » | 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 6702303283834f74a0fa77792774729996e92c43..0b8547a8783d851a5223e9d89f01f2b68c641c3d 100644
--- a/media/audio/fake_audio_output_stream.cc
+++ b/media/audio/fake_audio_output_stream.cc
@@ -9,51 +9,58 @@
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/time/time.h"
-#include "media/audio/audio_manager_base.h"
namespace media {
// static
AudioOutputStream* FakeAudioOutputStream::MakeFakeStream(
- AudioManagerBase* manager, const AudioParameters& params) {
- return new FakeAudioOutputStream(manager, params);
+ const scoped_refptr<base::SingleThreadTaskRunner>& audio_task_runner,
+ const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
+ const AudioParameters& params) {
+ return new FakeAudioOutputStream(audio_task_runner, worker_task_runner,
+ params);
}
-FakeAudioOutputStream::FakeAudioOutputStream(AudioManagerBase* manager,
- const AudioParameters& params)
- : audio_manager_(manager),
- callback_(NULL),
- fake_worker_(manager->GetWorkerTaskRunner(), params),
+FakeAudioOutputStream::FakeAudioOutputStream(
+ const scoped_refptr<base::SingleThreadTaskRunner>& audio_task_runner,
+ const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
+ const AudioParameters& params)
+ : callback_(NULL),
+ fake_worker_(worker_task_runner, params),
+ audio_task_runner_(audio_task_runner),
+ worker_task_runner_(worker_task_runner),
audio_bus_(AudioBus::Create(params)) {
+ DCHECK(audio_task_runner_->BelongsToCurrentThread());
}
FakeAudioOutputStream::~FakeAudioOutputStream() {
+ DCHECK(audio_task_runner_->BelongsToCurrentThread());
DCHECK(!callback_);
}
bool FakeAudioOutputStream::Open() {
- DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
+ DCHECK(audio_task_runner_->BelongsToCurrentThread());
audio_bus_->Zero();
return true;
}
void FakeAudioOutputStream::Start(AudioSourceCallback* callback) {
- DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
+ DCHECK(audio_task_runner_->BelongsToCurrentThread());
callback_ = callback;
fake_worker_.Start(base::Bind(
&FakeAudioOutputStream::CallOnMoreData, base::Unretained(this)));
}
void FakeAudioOutputStream::Stop() {
- DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
+ DCHECK(audio_task_runner_->BelongsToCurrentThread());
fake_worker_.Stop();
callback_ = NULL;
}
void FakeAudioOutputStream::Close() {
+ DCHECK(audio_task_runner_->BelongsToCurrentThread());
DCHECK(!callback_);
- DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
- audio_manager_->ReleaseOutputStream(this);
+ delete this;
}
void FakeAudioOutputStream::SetVolume(double volume) {}
@@ -63,7 +70,7 @@ void FakeAudioOutputStream::GetVolume(double* volume) {
}
void FakeAudioOutputStream::CallOnMoreData() {
- DCHECK(audio_manager_->GetWorkerTaskRunner()->BelongsToCurrentThread());
+ DCHECK(worker_task_runner_->BelongsToCurrentThread());
callback_->OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
audio_bus_.get());
}
« no previous file with comments | « media/audio/fake_audio_output_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698