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

Side by Side Diff: chromecast/renderer/media/chromecast_media_renderer_factory.cc

Issue 1553503002: Convert Pass()→std::move() in //chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/renderer/media/chromecast_media_renderer_factory.h" 5 #include "chromecast/renderer/media/chromecast_media_renderer_factory.h"
6 6
7 #include <utility>
8
7 #include "chromecast/renderer/media/cma_renderer.h" 9 #include "chromecast/renderer/media/cma_renderer.h"
8 #include "chromecast/renderer/media/media_pipeline_proxy.h" 10 #include "chromecast/renderer/media/media_pipeline_proxy.h"
9 #include "content/public/renderer/render_thread.h" 11 #include "content/public/renderer/render_thread.h"
10 #include "media/renderers/gpu_video_accelerator_factories.h" 12 #include "media/renderers/gpu_video_accelerator_factories.h"
11 13
12 namespace chromecast { 14 namespace chromecast {
13 namespace media { 15 namespace media {
14 16
15 ChromecastMediaRendererFactory::ChromecastMediaRendererFactory( 17 ChromecastMediaRendererFactory::ChromecastMediaRendererFactory(
16 ::media::GpuVideoAcceleratorFactories* gpu_factories, 18 ::media::GpuVideoAcceleratorFactories* gpu_factories,
17 int render_frame_id) 19 int render_frame_id)
18 : render_frame_id_(render_frame_id), gpu_factories_(gpu_factories) {} 20 : render_frame_id_(render_frame_id), gpu_factories_(gpu_factories) {}
19 21
20 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { 22 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() {
21 } 23 }
22 24
23 scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( 25 scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer(
24 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 26 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
25 const scoped_refptr<base::TaskRunner>& worker_task_runner, 27 const scoped_refptr<base::TaskRunner>& worker_task_runner,
26 ::media::AudioRendererSink* audio_renderer_sink, 28 ::media::AudioRendererSink* audio_renderer_sink,
27 ::media::VideoRendererSink* video_renderer_sink) { 29 ::media::VideoRendererSink* video_renderer_sink) {
28 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. 30 // TODO(erickung): crbug.com/443956. Need to provide right LoadType.
29 LoadType cma_load_type = kLoadTypeMediaSource; 31 LoadType cma_load_type = kLoadTypeMediaSource;
30 scoped_ptr<MediaPipelineProxy> cma_media_pipeline(new MediaPipelineProxy( 32 scoped_ptr<MediaPipelineProxy> cma_media_pipeline(new MediaPipelineProxy(
31 render_frame_id_, 33 render_frame_id_,
32 content::RenderThread::Get()->GetIOMessageLoopProxy(), 34 content::RenderThread::Get()->GetIOMessageLoopProxy(),
33 cma_load_type)); 35 cma_load_type));
34 scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer( 36 scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer(
35 cma_media_pipeline.Pass(), video_renderer_sink, gpu_factories_)); 37 std::move(cma_media_pipeline), video_renderer_sink, gpu_factories_));
36 return cma_renderer.Pass(); 38 return std::move(cma_renderer);
37 } 39 }
38 40
39 } // namespace media 41 } // namespace media
40 } // namespace chromecast 42 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/renderer/media/audio_pipeline_proxy.cc ('k') | chromecast/renderer/media/cma_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698