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

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

Issue 979913002: Chromecast: replay buildfixes in SwitchingMediaRenderer code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chromecast/media/base/switching_media_renderer.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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"
11 #include "content/public/renderer/render_thread.h" 11 #include "content/public/renderer/render_thread.h"
12 #include "media/base/audio_hardware_config.h" 12 #include "media/base/audio_hardware_config.h"
13 #include "media/base/media_log.h" 13 #include "media/base/media_log.h"
14 #include "media/renderers/default_renderer_factory.h" 14 #include "media/renderers/default_renderer_factory.h"
15 #include "media/renderers/gpu_video_accelerator_factories.h"
15 16
16 namespace chromecast { 17 namespace chromecast {
17 namespace media { 18 namespace media {
18 19
19 ChromecastMediaRendererFactory::ChromecastMediaRendererFactory( 20 ChromecastMediaRendererFactory::ChromecastMediaRendererFactory(
20 const scoped_refptr<::media::MediaLog>& media_log, 21 const scoped_refptr<::media::MediaLog>& media_log,
21 int render_frame_id) 22 int render_frame_id)
22 : render_frame_id_(render_frame_id), 23 : render_frame_id_(render_frame_id),
23 media_log_(media_log) { 24 media_log_(media_log) {
24 } 25 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 scoped_ptr<::media::Renderer> default_media_render( 65 scoped_ptr<::media::Renderer> default_media_render(
65 default_render_factory_->CreateRenderer(media_task_runner, 66 default_render_factory_->CreateRenderer(media_task_runner,
66 audio_renderer_sink)); 67 audio_renderer_sink));
67 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer( 68 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer(
68 default_media_render.Pass(), cma_renderer.Pass())); 69 default_media_render.Pass(), cma_renderer.Pass()));
69 return media_renderer.Pass(); 70 return media_renderer.Pass();
70 } 71 }
71 72
72 } // namespace media 73 } // namespace media
73 } // namespace chromecast 74 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/base/switching_media_renderer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698