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

Side by Side Diff: chromecast/media/service/cast_renderer.cc

Issue 2712883006: [Chromecast] Add new volume control API to CastMediaShlib (Closed)
Patch Set: Address Alok's comments 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromecast/media/service/cast_renderer.h" 5 #include "chromecast/media/service/cast_renderer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "chromecast/base/task_runner_impl.h" 9 #include "chromecast/base/task_runner_impl.h"
10 #include "chromecast/media/base/audio_device_ids.h"
10 #include "chromecast/media/base/video_mode_switcher.h" 11 #include "chromecast/media/base/video_mode_switcher.h"
11 #include "chromecast/media/base/video_resolution_policy.h" 12 #include "chromecast/media/base/video_resolution_policy.h"
12 #include "chromecast/media/cdm/cast_cdm_context.h" 13 #include "chromecast/media/cdm/cast_cdm_context.h"
13 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h" 14 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h"
14 #include "chromecast/media/cma/base/cma_logging.h" 15 #include "chromecast/media/cma/base/cma_logging.h"
15 #include "chromecast/media/cma/base/demuxer_stream_adapter.h" 16 #include "chromecast/media/cma/base/demuxer_stream_adapter.h"
16 #include "chromecast/media/cma/pipeline/media_pipeline_impl.h" 17 #include "chromecast/media/cma/pipeline/media_pipeline_impl.h"
17 #include "chromecast/media/cma/pipeline/video_pipeline_client.h" 18 #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
19 #include "chromecast/public/cast_media_shlib.h"
18 #include "chromecast/public/media/media_pipeline_backend.h" 20 #include "chromecast/public/media/media_pipeline_backend.h"
19 #include "chromecast/public/media/media_pipeline_device_params.h" 21 #include "chromecast/public/media/media_pipeline_device_params.h"
22 #include "media/audio/audio_device_description.h"
20 #include "media/base/audio_decoder_config.h" 23 #include "media/base/audio_decoder_config.h"
21 #include "media/base/demuxer_stream.h" 24 #include "media/base/demuxer_stream.h"
22 #include "media/base/media_log.h" 25 #include "media/base/media_log.h"
23 #include "media/base/media_resource.h" 26 #include "media/base/media_resource.h"
24 #include "media/base/renderer_client.h" 27 #include "media/base/renderer_client.h"
25 28
26 namespace chromecast { 29 namespace chromecast {
27 namespace media { 30 namespace media {
28 31
29 namespace { 32 namespace {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // Create pipeline backend. 88 // Create pipeline backend.
86 media_resource_usage_.reset( 89 media_resource_usage_.reset(
87 new MediaResourceTracker::ScopedUsage(media_resource_tracker_)); 90 new MediaResourceTracker::ScopedUsage(media_resource_tracker_));
88 backend_task_runner_.reset(new TaskRunnerImpl()); 91 backend_task_runner_.reset(new TaskRunnerImpl());
89 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. 92 // TODO(erickung): crbug.com/443956. Need to provide right LoadType.
90 LoadType load_type = kLoadTypeMediaSource; 93 LoadType load_type = kLoadTypeMediaSource;
91 MediaPipelineDeviceParams::MediaSyncType sync_type = 94 MediaPipelineDeviceParams::MediaSyncType sync_type =
92 (load_type == kLoadTypeMediaStream) 95 (load_type == kLoadTypeMediaStream)
93 ? MediaPipelineDeviceParams::kModeIgnorePts 96 ? MediaPipelineDeviceParams::kModeIgnorePts
94 : MediaPipelineDeviceParams::kModeSyncPts; 97 : MediaPipelineDeviceParams::kModeSyncPts;
95 MediaPipelineDeviceParams params(sync_type, backend_task_runner_.get()); 98 AudioContentType content_type;
99 if (audio_device_id_ == kAlarmAudioDeviceId) {
100 content_type = AudioContentType::kAlarm;
101 } else if (audio_device_id_ ==
102 ::media::AudioDeviceDescription::kCommunicationsDeviceId) {
103 content_type = AudioContentType::kCommunication;
104 } else {
105 content_type = AudioContentType::kMedia;
106 }
107 MediaPipelineDeviceParams params(sync_type, backend_task_runner_.get(),
108 content_type, audio_device_id_);
96 std::unique_ptr<MediaPipelineBackend> backend = 109 std::unique_ptr<MediaPipelineBackend> backend =
97 backend_factory_->CreateBackend(params, audio_device_id_); 110 backend_factory_->CreateBackend(params);
98 111
99 // Create pipeline. 112 // Create pipeline.
100 MediaPipelineClient pipeline_client; 113 MediaPipelineClient pipeline_client;
101 pipeline_client.error_cb = 114 pipeline_client.error_cb =
102 base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr()); 115 base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr());
103 pipeline_client.buffering_state_cb = base::Bind( 116 pipeline_client.buffering_state_cb = base::Bind(
104 &CastRenderer::OnBufferingStateChange, weak_factory_.GetWeakPtr()); 117 &CastRenderer::OnBufferingStateChange, weak_factory_.GetWeakPtr());
105 pipeline_.reset(new MediaPipelineImpl()); 118 pipeline_.reset(new MediaPipelineImpl());
106 pipeline_->SetClient(pipeline_client); 119 pipeline_->SetClient(pipeline_client);
107 pipeline_->Initialize(load_type, std::move(backend)); 120 pipeline_->Initialize(load_type, std::move(backend));
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 } 312 }
300 313
301 void CastRenderer::OnVideoOpacityChange(bool opaque) { 314 void CastRenderer::OnVideoOpacityChange(bool opaque) {
302 DCHECK(task_runner_->BelongsToCurrentThread()); 315 DCHECK(task_runner_->BelongsToCurrentThread());
303 DCHECK(opaque); 316 DCHECK(opaque);
304 client_->OnVideoOpacityChange(opaque); 317 client_->OnVideoOpacityChange(opaque);
305 } 318 }
306 319
307 } // namespace media 320 } // namespace media
308 } // namespace chromecast 321 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698