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

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

Issue 2544523002: Pass Connector* into MojoMediaClient::Initialize(). (Closed)
Patch Set: Rebase. Created 4 years 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_mojo_media_client.h" 5 #include "chromecast/media/service/cast_mojo_media_client.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chromecast/media/service/cast_renderer.h" 8 #include "chromecast/media/service/cast_renderer.h"
9 #include "media/base/audio_renderer_sink.h" 9 #include "media/base/audio_renderer_sink.h"
10 #include "media/base/cdm_factory.h" 10 #include "media/base/cdm_factory.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 MediaResourceTracker* media_resource_tracker_; 85 MediaResourceTracker* media_resource_tracker_;
86 DISALLOW_COPY_AND_ASSIGN(CastRendererFactory); 86 DISALLOW_COPY_AND_ASSIGN(CastRendererFactory);
87 }; 87 };
88 } // namespace 88 } // namespace
89 89
90 CastMojoMediaClient::CastMojoMediaClient( 90 CastMojoMediaClient::CastMojoMediaClient(
91 const CreateMediaPipelineBackendCB& create_backend_cb, 91 const CreateMediaPipelineBackendCB& create_backend_cb,
92 const CreateCdmFactoryCB& create_cdm_factory_cb, 92 const CreateCdmFactoryCB& create_cdm_factory_cb,
93 VideoResolutionPolicy* video_resolution_policy, 93 VideoResolutionPolicy* video_resolution_policy,
94 MediaResourceTracker* media_resource_tracker) 94 MediaResourceTracker* media_resource_tracker)
95 : create_backend_cb_(create_backend_cb), 95 : connector_(nullptr),
96 create_backend_cb_(create_backend_cb),
96 create_cdm_factory_cb_(create_cdm_factory_cb), 97 create_cdm_factory_cb_(create_cdm_factory_cb),
97 video_resolution_policy_(video_resolution_policy), 98 video_resolution_policy_(video_resolution_policy),
98 media_resource_tracker_(media_resource_tracker) {} 99 media_resource_tracker_(media_resource_tracker) {}
99 100
100 CastMojoMediaClient::~CastMojoMediaClient() {} 101 CastMojoMediaClient::~CastMojoMediaClient() {}
101 102
103 void CastMojoMediaClient::Initialize(service_manager::Connector* connector) {
104 DCHECK(!connector_);
105 DCHECK(connector);
106 connector_ = connector;
107 }
108
102 scoped_refptr<::media::AudioRendererSink> 109 scoped_refptr<::media::AudioRendererSink>
103 CastMojoMediaClient::CreateAudioRendererSink( 110 CastMojoMediaClient::CreateAudioRendererSink(
104 const std::string& audio_device_id) { 111 const std::string& audio_device_id) {
105 return new CastAudioRendererSink(audio_device_id); 112 return new CastAudioRendererSink(audio_device_id);
106 } 113 }
107 114
108 std::unique_ptr<::media::RendererFactory> 115 std::unique_ptr<::media::RendererFactory>
109 CastMojoMediaClient::CreateRendererFactory( 116 CastMojoMediaClient::CreateRendererFactory(
110 const scoped_refptr<::media::MediaLog>& media_log) { 117 const scoped_refptr<::media::MediaLog>& media_log) {
111 return base::MakeUnique<CastRendererFactory>(create_backend_cb_, media_log, 118 return base::MakeUnique<CastRendererFactory>(create_backend_cb_, media_log,
112 video_resolution_policy_, 119 video_resolution_policy_,
113 media_resource_tracker_); 120 media_resource_tracker_);
114 } 121 }
115 122
116 std::unique_ptr<::media::CdmFactory> CastMojoMediaClient::CreateCdmFactory( 123 std::unique_ptr<::media::CdmFactory> CastMojoMediaClient::CreateCdmFactory(
117 service_manager::mojom::InterfaceProvider* interface_provider) { 124 service_manager::mojom::InterfaceProvider* /* interface_provider */) {
118 return create_cdm_factory_cb_.Run(); 125 return create_cdm_factory_cb_.Run();
119 } 126 }
120 127
121 } // namespace media 128 } // namespace media
122 } // namespace chromecast 129 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698