chromecast/renderer/media/chromecast_media_renderer_factory.cc - Issue 1372393007: [Chromecast] Upgrade to new CMA backend API

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

Issue 1372393007: [Chromecast] Upgrade to new CMA backend API (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Remove unnecessary abstract base classes. Created 5 years, 2 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

« chromecast/media/cma/pipeline/av_pipeline_impl.h ('K') | « chromecast/renderer/media/audio_pipeline_proxy.cc ('k') | chromecast/renderer/media/media_pipeline_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/command_line.h"	7 #include "base/command_line.h"

8 #include "chromecast/media/base/switching_media_renderer.h"	8 #include "chromecast/media/base/switching_media_renderer.h"

9 #include "chromecast/media/cma/filters/cma_renderer.h"	9 #include "chromecast/media/cma/filters/cma_renderer.h"

10 #include "chromecast/renderer/media/media_pipeline_proxy.h"	10 #include "chromecast/renderer/media/media_pipeline_proxy.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 audio_config_.reset(new ::media::AudioHardwareConfig(input_audio_params,	52 audio_config_.reset(new ::media::AudioHardwareConfig(input_audio_params,

53 output_audio_params));	53 output_audio_params));

54	54

55 default_render_factory_.reset(new ::media::DefaultRendererFactory(	55 default_render_factory_.reset(new ::media::DefaultRendererFactory(

56 media_log_, /gpu_factories/ nullptr, *audio_config_));	56 media_log_, /gpu_factories/ nullptr, *audio_config_));

57 }	57 }

58	58

59 DCHECK(default_render_factory_);	59 DCHECK(default_render_factory_);

60 // TODO(erickung): crbug.com/443956. Need to provide right LoadType.	60 // TODO(erickung): crbug.com/443956. Need to provide right LoadType.

61 LoadType cma_load_type = kLoadTypeMediaSource;	61 LoadType cma_load_type = kLoadTypeMediaSource;

62 scoped_ptr<MediaPipeline> cma_media_pipeline(	62 scoped_ptr<MediaPipelineProxy> cma_media_pipeline(new MediaPipelineProxy(

63 new MediaPipelineProxy(	63 render_frame_id_,

64 render_frame_id_,	64 content::RenderThread::Get()->GetIOMessageLoopProxy(),

65 content::RenderThread::Get()->GetIOMessageLoopProxy(),	65 cma_load_type));

66 cma_load_type));

67 scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer(	66 scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer(

68 cma_media_pipeline.Pass(), video_renderer_sink, gpu_factories_));	67 cma_media_pipeline.Pass(), video_renderer_sink, gpu_factories_));

69 scoped_ptr<::media::Renderer> default_media_render(	68 scoped_ptr<::media::Renderer> default_media_render(
	slan 2015/10/07 20:56:16 nit: default_media_renderer nit: default_media_renderer kmackay 2015/10/09 20:35:40 Done. Show quoted text On 2015/10/07 20:56:16, slan wrote: > nit: default_media_renderer Done.
70 default_render_factory_->CreateRenderer(	69 default_render_factory_->CreateRenderer(
	slan 2015/10/07 20:56:16 nit: default_renderer_factory_ nit: default_renderer_factory_ kmackay 2015/10/09 20:35:40 Done. Show quoted text On 2015/10/07 20:56:16, slan wrote: > nit: default_renderer_factory_ Done.
71 media_task_runner, media_task_runner, audio_renderer_sink,	70 media_task_runner, media_task_runner, audio_renderer_sink,

72 video_renderer_sink));	71 video_renderer_sink));

73 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer(	72 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer(

74 default_media_render.Pass(), cma_renderer.Pass()));	73 default_media_render.Pass(), cma_renderer.Pass()));

75 return media_renderer.Pass();	74 return media_renderer.Pass();

76 }	75 }

77	76

78 } // namespace media	77 } // namespace media

79 } // namespace chromecast	78 } // namespace chromecast

OLD	NEW