| Index: media/audio/audio_output_dispatcher_impl.cc
|
| diff --git a/media/audio/audio_output_dispatcher_impl.cc b/media/audio/audio_output_dispatcher_impl.cc
|
| index 5118bef71e9240801c4f91797e56cb52f2240296..d2e1d1c6c66f6bf35e7dae2e73e03a14e62d8888 100644
|
| --- a/media/audio/audio_output_dispatcher_impl.cc
|
| +++ b/media/audio/audio_output_dispatcher_impl.cc
|
| @@ -8,7 +8,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/compiler_specific.h"
|
| -#include "base/message_loop/message_loop.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/time/time.h"
|
| #include "media/audio/audio_io.h"
|
| #include "media/audio/audio_output_proxy.h"
|
| @@ -41,7 +41,7 @@ AudioOutputDispatcherImpl::~AudioOutputDispatcherImpl() {
|
| }
|
|
|
| bool AudioOutputDispatcherImpl::OpenStream() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| // Ensure that there is at least one open stream.
|
| if (idle_streams_.empty() && !CreateAndOpenStream())
|
| @@ -55,7 +55,7 @@ bool AudioOutputDispatcherImpl::OpenStream() {
|
| bool AudioOutputDispatcherImpl::StartStream(
|
| AudioOutputStream::AudioSourceCallback* callback,
|
| AudioOutputProxy* stream_proxy) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK(proxy_to_physical_map_.find(stream_proxy) ==
|
| proxy_to_physical_map_.end());
|
|
|
| @@ -82,7 +82,7 @@ bool AudioOutputDispatcherImpl::StartStream(
|
| }
|
|
|
| void AudioOutputDispatcherImpl::StopStream(AudioOutputProxy* stream_proxy) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| AudioStreamMap::iterator it = proxy_to_physical_map_.find(stream_proxy);
|
| DCHECK(it != proxy_to_physical_map_.end());
|
| @@ -99,7 +99,7 @@ void AudioOutputDispatcherImpl::StopStream(AudioOutputProxy* stream_proxy) {
|
|
|
| void AudioOutputDispatcherImpl::StreamVolumeSet(AudioOutputProxy* stream_proxy,
|
| double volume) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| AudioStreamMap::iterator it = proxy_to_physical_map_.find(stream_proxy);
|
| if (it != proxy_to_physical_map_.end()) {
|
| AudioOutputStream* physical_stream = it->second;
|
| @@ -109,7 +109,7 @@ void AudioOutputDispatcherImpl::StreamVolumeSet(AudioOutputProxy* stream_proxy,
|
| }
|
|
|
| void AudioOutputDispatcherImpl::CloseStream(AudioOutputProxy* stream_proxy) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| DCHECK_GT(idle_proxies_, 0u);
|
| --idle_proxies_;
|
| @@ -121,7 +121,7 @@ void AudioOutputDispatcherImpl::CloseStream(AudioOutputProxy* stream_proxy) {
|
| }
|
|
|
| void AudioOutputDispatcherImpl::Shutdown() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| // Close all idle streams immediately. The |close_timer_| will handle
|
| // invalidating any outstanding tasks upon its destruction.
|
| @@ -129,7 +129,7 @@ void AudioOutputDispatcherImpl::Shutdown() {
|
| }
|
|
|
| bool AudioOutputDispatcherImpl::CreateAndOpenStream() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| AudioOutputStream* stream = audio_manager_->MakeAudioOutputStream(
|
| params_, output_device_id_, input_device_id_);
|
| if (!stream)
|
| @@ -150,12 +150,12 @@ bool AudioOutputDispatcherImpl::CreateAndOpenStream() {
|
| }
|
|
|
| void AudioOutputDispatcherImpl::CloseAllIdleStreams() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| CloseIdleStreams(0);
|
| }
|
|
|
| void AudioOutputDispatcherImpl::CloseIdleStreams(size_t keep_alive) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| if (idle_streams_.size() <= keep_alive)
|
| return;
|
| for (size_t i = keep_alive; i < idle_streams_.size(); ++i) {
|
| @@ -171,12 +171,12 @@ void AudioOutputDispatcherImpl::CloseIdleStreams(size_t keep_alive) {
|
| }
|
|
|
| void AudioOutputDispatcherImpl::CloseStreamsForWedgeFix() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| CloseAllIdleStreams();
|
| }
|
|
|
| void AudioOutputDispatcherImpl::RestartStreamsForWedgeFix() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| // Should only be called when the dispatcher is used with fake streams which
|
| // don't need to be shutdown or restarted.
|
|
|