OLD | NEW |
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/browser/media/cast_mojo_media_client.h" | 5 #include "chromecast/browser/media/cast_mojo_media_client.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "chromecast/browser/media/cast_renderer.h" | 8 #include "chromecast/browser/media/cast_renderer.h" |
8 | 9 |
9 namespace { | 10 namespace { |
10 class CastRendererFactory : public media::RendererFactory { | 11 class CastRendererFactory : public media::RendererFactory { |
11 public: | 12 public: |
12 CastRendererFactory( | 13 CastRendererFactory( |
13 const chromecast::media::CreateMediaPipelineBackendCB& create_backend_cb, | 14 const chromecast::media::CreateMediaPipelineBackendCB& create_backend_cb, |
14 const scoped_refptr<media::MediaLog>& media_log) | 15 const scoped_refptr<media::MediaLog>& media_log) |
15 : create_backend_cb_(create_backend_cb), media_log_(media_log) {} | 16 : create_backend_cb_(create_backend_cb), media_log_(media_log) {} |
16 ~CastRendererFactory() final {} | 17 ~CastRendererFactory() final {} |
17 | 18 |
18 scoped_ptr<media::Renderer> CreateRenderer( | 19 std::unique_ptr<media::Renderer> CreateRenderer( |
19 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 20 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
20 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 21 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
21 media::AudioRendererSink* audio_renderer_sink, | 22 media::AudioRendererSink* audio_renderer_sink, |
22 media::VideoRendererSink* video_renderer_sink, | 23 media::VideoRendererSink* video_renderer_sink, |
23 const media::RequestSurfaceCB& request_surface_cb) final { | 24 const media::RequestSurfaceCB& request_surface_cb) final { |
24 DCHECK(!audio_renderer_sink && !video_renderer_sink); | 25 DCHECK(!audio_renderer_sink && !video_renderer_sink); |
25 return make_scoped_ptr(new chromecast::media::CastRenderer( | 26 return base::WrapUnique(new chromecast::media::CastRenderer( |
26 create_backend_cb_, media_task_runner)); | 27 create_backend_cb_, media_task_runner)); |
27 } | 28 } |
28 | 29 |
29 private: | 30 private: |
30 const chromecast::media::CreateMediaPipelineBackendCB create_backend_cb_; | 31 const chromecast::media::CreateMediaPipelineBackendCB create_backend_cb_; |
31 scoped_refptr<media::MediaLog> media_log_; | 32 scoped_refptr<media::MediaLog> media_log_; |
32 DISALLOW_COPY_AND_ASSIGN(CastRendererFactory); | 33 DISALLOW_COPY_AND_ASSIGN(CastRendererFactory); |
33 }; | 34 }; |
34 } // namespace | 35 } // namespace |
35 | 36 |
36 namespace chromecast { | 37 namespace chromecast { |
37 namespace media { | 38 namespace media { |
38 | 39 |
39 CastMojoMediaClient::CastMojoMediaClient( | 40 CastMojoMediaClient::CastMojoMediaClient( |
40 const CreateMediaPipelineBackendCB& create_backend_cb) | 41 const CreateMediaPipelineBackendCB& create_backend_cb) |
41 : create_backend_cb_(create_backend_cb) {} | 42 : create_backend_cb_(create_backend_cb) {} |
42 | 43 |
43 CastMojoMediaClient::~CastMojoMediaClient() {} | 44 CastMojoMediaClient::~CastMojoMediaClient() {} |
44 | 45 |
45 scoped_ptr<::media::RendererFactory> CastMojoMediaClient::CreateRendererFactory( | 46 std::unique_ptr<::media::RendererFactory> |
| 47 CastMojoMediaClient::CreateRendererFactory( |
46 const scoped_refptr<::media::MediaLog>& media_log) { | 48 const scoped_refptr<::media::MediaLog>& media_log) { |
47 return make_scoped_ptr( | 49 return base::WrapUnique( |
48 new CastRendererFactory(create_backend_cb_, media_log)); | 50 new CastRendererFactory(create_backend_cb_, media_log)); |
49 } | 51 } |
50 | 52 |
51 } // namespace media | 53 } // namespace media |
52 } // namespace chromecast | 54 } // namespace chromecast |
OLD | NEW |