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

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

Issue 2722673004: Revert of [Chromecast] Process streams with different post-processing. (Closed)
Patch Set: Created 3 years, 9 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"
11 #include "chromecast/media/base/video_mode_switcher.h" 10 #include "chromecast/media/base/video_mode_switcher.h"
12 #include "chromecast/media/base/video_resolution_policy.h" 11 #include "chromecast/media/base/video_resolution_policy.h"
13 #include "chromecast/media/cdm/cast_cdm_context.h" 12 #include "chromecast/media/cdm/cast_cdm_context.h"
14 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h" 13 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h"
15 #include "chromecast/media/cma/base/cma_logging.h" 14 #include "chromecast/media/cma/base/cma_logging.h"
16 #include "chromecast/media/cma/base/demuxer_stream_adapter.h" 15 #include "chromecast/media/cma/base/demuxer_stream_adapter.h"
17 #include "chromecast/media/cma/pipeline/media_pipeline_impl.h" 16 #include "chromecast/media/cma/pipeline/media_pipeline_impl.h"
18 #include "chromecast/media/cma/pipeline/video_pipeline_client.h" 17 #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
19 #include "chromecast/public/media/media_pipeline_backend.h" 18 #include "chromecast/public/media/media_pipeline_backend.h"
20 #include "chromecast/public/media/media_pipeline_device_params.h" 19 #include "chromecast/public/media/media_pipeline_device_params.h"
21 #include "media/audio/audio_device_description.h"
22 #include "media/base/audio_decoder_config.h" 20 #include "media/base/audio_decoder_config.h"
23 #include "media/base/demuxer_stream.h" 21 #include "media/base/demuxer_stream.h"
24 #include "media/base/media_log.h" 22 #include "media/base/media_log.h"
25 #include "media/base/media_resource.h" 23 #include "media/base/media_resource.h"
26 #include "media/base/renderer_client.h" 24 #include "media/base/renderer_client.h"
27 25
28 namespace chromecast { 26 namespace chromecast {
29 namespace media { 27 namespace media {
30 28
31 namespace { 29 namespace {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // Create pipeline backend. 85 // Create pipeline backend.
88 media_resource_usage_.reset( 86 media_resource_usage_.reset(
89 new MediaResourceTracker::ScopedUsage(media_resource_tracker_)); 87 new MediaResourceTracker::ScopedUsage(media_resource_tracker_));
90 backend_task_runner_.reset(new TaskRunnerImpl()); 88 backend_task_runner_.reset(new TaskRunnerImpl());
91 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. 89 // TODO(erickung): crbug.com/443956. Need to provide right LoadType.
92 LoadType load_type = kLoadTypeMediaSource; 90 LoadType load_type = kLoadTypeMediaSource;
93 MediaPipelineDeviceParams::MediaSyncType sync_type = 91 MediaPipelineDeviceParams::MediaSyncType sync_type =
94 (load_type == kLoadTypeMediaStream) 92 (load_type == kLoadTypeMediaStream)
95 ? MediaPipelineDeviceParams::kModeIgnorePts 93 ? MediaPipelineDeviceParams::kModeIgnorePts
96 : MediaPipelineDeviceParams::kModeSyncPts; 94 : MediaPipelineDeviceParams::kModeSyncPts;
97 std::string device_id = audio_device_id_; 95 MediaPipelineDeviceParams params(sync_type, backend_task_runner_.get());
98 if (device_id == "")
99 device_id = ::media::AudioDeviceDescription::kDefaultDeviceId;
100
101 MediaPipelineDeviceParams params(
102 sync_type, MediaPipelineDeviceParams::kAudioStreamNormal, device_id,
103 backend_task_runner_.get());
104
105 if (audio_device_id_ == kTtsAudioDeviceId ||
106 audio_device_id_ ==
107 ::media::AudioDeviceDescription::kCommunicationsDeviceId) {
108 load_type = kLoadTypeCommunication;
109 }
110
111 std::unique_ptr<MediaPipelineBackend> backend = 96 std::unique_ptr<MediaPipelineBackend> backend =
112 backend_factory_->CreateBackend(params, audio_device_id_); 97 backend_factory_->CreateBackend(params, audio_device_id_);
113 98
114 // Create pipeline. 99 // Create pipeline.
115 MediaPipelineClient pipeline_client; 100 MediaPipelineClient pipeline_client;
116 pipeline_client.error_cb = 101 pipeline_client.error_cb =
117 base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr()); 102 base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr());
118 pipeline_client.buffering_state_cb = base::Bind( 103 pipeline_client.buffering_state_cb = base::Bind(
119 &CastRenderer::OnBufferingStateChange, weak_factory_.GetWeakPtr()); 104 &CastRenderer::OnBufferingStateChange, weak_factory_.GetWeakPtr());
120 pipeline_.reset(new MediaPipelineImpl()); 105 pipeline_.reset(new MediaPipelineImpl());
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 } 292 }
308 293
309 void CastRenderer::OnVideoOpacityChange(bool opaque) { 294 void CastRenderer::OnVideoOpacityChange(bool opaque) {
310 DCHECK(task_runner_->BelongsToCurrentThread()); 295 DCHECK(task_runner_->BelongsToCurrentThread());
311 DCHECK(opaque); 296 DCHECK(opaque);
312 client_->OnVideoOpacityChange(opaque); 297 client_->OnVideoOpacityChange(opaque);
313 } 298 }
314 299
315 } // namespace media 300 } // namespace media
316 } // namespace chromecast 301 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/pipeline/media_pipeline_impl.cc ('k') | chromecast/public/media/media_pipeline_device_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698