| Index: chromecast/media/audio/cast_audio_manager.cc
|
| diff --git a/chromecast/media/audio/cast_audio_manager.cc b/chromecast/media/audio/cast_audio_manager.cc
|
| index 54cd79454398beafd1e73e8aa929027aaf3ad4d8..1321e90acab6c0e52620f308ffb9f49602631301 100644
|
| --- a/chromecast/media/audio/cast_audio_manager.cc
|
| +++ b/chromecast/media/audio/cast_audio_manager.cc
|
| @@ -8,10 +8,7 @@
|
| #include <string>
|
|
|
| #include "chromecast/media/audio/cast_audio_output_stream.h"
|
| -#include "chromecast/media/base/media_message_loop.h"
|
| #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h"
|
| -#include "chromecast/public/cast_media_shlib.h"
|
| -#include "chromecast/public/media/media_pipeline_backend.h"
|
|
|
| namespace {
|
| // TODO(alokp): Query the preferred value from media backend.
|
| @@ -28,8 +25,10 @@ static const int kDefaultOutputBufferSize = 2048;
|
| namespace chromecast {
|
| namespace media {
|
|
|
| -CastAudioManager::CastAudioManager(::media::AudioLogFactory* audio_log_factory)
|
| - : AudioManagerBase(audio_log_factory) {}
|
| +CastAudioManager::CastAudioManager(::media::AudioLogFactory* audio_log_factory,
|
| + MediaPipelineBackendManager* backend_manager)
|
| + : AudioManagerBase(audio_log_factory), backend_manager_(backend_manager) {
|
| +}
|
|
|
| CastAudioManager::~CastAudioManager() {
|
| Shutdown();
|
| @@ -64,10 +63,7 @@ void CastAudioManager::GetAudioInputDeviceNames(
|
|
|
| scoped_ptr<MediaPipelineBackend> CastAudioManager::CreateMediaPipelineBackend(
|
| const MediaPipelineDeviceParams& params) {
|
| - DCHECK(media::MediaMessageLoop::GetTaskRunner()->BelongsToCurrentThread());
|
| -
|
| - return scoped_ptr<MediaPipelineBackend>(
|
| - MediaPipelineBackendManager::CreateMediaPipelineBackend(params));
|
| + return backend_manager_->CreateMediaPipelineBackend(params);
|
| }
|
|
|
| ::media::AudioOutputStream* CastAudioManager::MakeLinearOutputStream(
|
|
|