| Index: chromecast/media/service/cast_renderer.cc
|
| diff --git a/chromecast/media/service/cast_renderer.cc b/chromecast/media/service/cast_renderer.cc
|
| index f3bd681a8605aaef4ae59c9b7e44936ec514f403..48a2374bb487ffcb3fa22264b97ab29d734e11af 100644
|
| --- a/chromecast/media/service/cast_renderer.cc
|
| +++ b/chromecast/media/service/cast_renderer.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/bind.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "chromecast/base/task_runner_impl.h"
|
| +#include "chromecast/media/base/audio_device_ids.h"
|
| #include "chromecast/media/base/video_mode_switcher.h"
|
| #include "chromecast/media/base/video_resolution_policy.h"
|
| #include "chromecast/media/cdm/cast_cdm_context.h"
|
| @@ -15,8 +16,10 @@
|
| #include "chromecast/media/cma/base/demuxer_stream_adapter.h"
|
| #include "chromecast/media/cma/pipeline/media_pipeline_impl.h"
|
| #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
|
| +#include "chromecast/public/cast_media_shlib.h"
|
| #include "chromecast/public/media/media_pipeline_backend.h"
|
| #include "chromecast/public/media/media_pipeline_device_params.h"
|
| +#include "media/audio/audio_device_description.h"
|
| #include "media/base/audio_decoder_config.h"
|
| #include "media/base/demuxer_stream.h"
|
| #include "media/base/media_log.h"
|
| @@ -92,9 +95,19 @@ void CastRenderer::Initialize(::media::MediaResource* media_resource,
|
| (load_type == kLoadTypeMediaStream)
|
| ? MediaPipelineDeviceParams::kModeIgnorePts
|
| : MediaPipelineDeviceParams::kModeSyncPts;
|
| - MediaPipelineDeviceParams params(sync_type, backend_task_runner_.get());
|
| + AudioContentType content_type;
|
| + if (audio_device_id_ == kAlarmAudioDeviceId) {
|
| + content_type = AudioContentType::kAlarm;
|
| + } else if (audio_device_id_ ==
|
| + ::media::AudioDeviceDescription::kCommunicationsDeviceId) {
|
| + content_type = AudioContentType::kCommunication;
|
| + } else {
|
| + content_type = AudioContentType::kMedia;
|
| + }
|
| + MediaPipelineDeviceParams params(sync_type, backend_task_runner_.get(),
|
| + content_type, audio_device_id_);
|
| std::unique_ptr<MediaPipelineBackend> backend =
|
| - backend_factory_->CreateBackend(params, audio_device_id_);
|
| + backend_factory_->CreateBackend(params);
|
|
|
| // Create pipeline.
|
| MediaPipelineClient pipeline_client;
|
|
|