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

Unified Diff: chromecast/media/service/cast_renderer.cc

Issue 2712883006: [Chromecast] Add new volume control API to CastMediaShlib (Closed)
Patch Set: [Chromecast] Add new volume control API to CastMediaShlib Created 3 years, 10 months 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
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..3d0711811422331f4df198894ff1801232b83245 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,6 +16,7 @@
#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/base/audio_decoder_config.h"
@@ -92,9 +94,18 @@ 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_ == kTtsAudioDeviceId) {
+ content_type = AudioContentType::kTts;
+ } 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;

Powered by Google App Engine
This is Rietveld 408576698