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

Side by Side Diff: media/renderers/default_renderer_factory.cc

Issue 1209363004: media: Support RendererFactory in MojoMediaClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android build (hopefully) Created 5 years, 5 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
« media/BUILD.gn ('K') | « media/mojo/services/mojo_renderer_service.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/renderers/default_renderer_factory.h" 5 #include "media/renderers/default_renderer_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "build/build_config.h"
8 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
9 #if !defined(MEDIA_DISABLE_FFMPEG)
10 #include "media/base/media_log.h" 10 #include "media/base/media_log.h"
11 #include "media/filters/ffmpeg_audio_decoder.h"
12 #include "media/filters/ffmpeg_video_decoder.h"
13 #endif
14 #include "media/filters/gpu_video_decoder.h" 11 #include "media/filters/gpu_video_decoder.h"
15 #include "media/filters/opus_audio_decoder.h"
16 #include "media/renderers/audio_renderer_impl.h" 12 #include "media/renderers/audio_renderer_impl.h"
17 #include "media/renderers/gpu_video_accelerator_factories.h" 13 #include "media/renderers/gpu_video_accelerator_factories.h"
18 #include "media/renderers/renderer_impl.h" 14 #include "media/renderers/renderer_impl.h"
19 #include "media/renderers/video_renderer_impl.h" 15 #include "media/renderers/video_renderer_impl.h"
16
17 #if !defined(MEDIA_DISABLE_FFMPEG)
18 #include "media/filters/ffmpeg_audio_decoder.h"
19 #include "media/filters/ffmpeg_video_decoder.h"
20 #endif
21
22 #if !defined(OS_ANDROID)
23 #include "media/filters/opus_audio_decoder.h"
24 #endif
25
20 #if !defined(MEDIA_DISABLE_LIBVPX) 26 #if !defined(MEDIA_DISABLE_LIBVPX)
21 #include "media/filters/vpx_video_decoder.h" 27 #include "media/filters/vpx_video_decoder.h"
22 #endif 28 #endif
23 29
24 namespace media { 30 namespace media {
25 31
26 DefaultRendererFactory::DefaultRendererFactory( 32 DefaultRendererFactory::DefaultRendererFactory(
27 const scoped_refptr<MediaLog>& media_log, 33 const scoped_refptr<MediaLog>& media_log,
28 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories, 34 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
29 const AudioHardwareConfig& audio_hardware_config) 35 const AudioHardwareConfig& audio_hardware_config)
30 : media_log_(media_log), 36 : media_log_(media_log),
31 gpu_factories_(gpu_factories), 37 gpu_factories_(gpu_factories),
32 audio_hardware_config_(audio_hardware_config) { 38 audio_hardware_config_(audio_hardware_config) {
33 } 39 }
34 40
35 DefaultRendererFactory::~DefaultRendererFactory() { 41 DefaultRendererFactory::~DefaultRendererFactory() {
36 } 42 }
37 43
38 // TODO(xhwang): Use RendererConfig to customize what decoders we use.
39 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( 44 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
40 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
41 AudioRendererSink* audio_renderer_sink, 46 AudioRendererSink* audio_renderer_sink,
42 VideoRendererSink* video_renderer_sink) { 47 VideoRendererSink* video_renderer_sink) {
43 DCHECK(audio_renderer_sink); 48 DCHECK(audio_renderer_sink);
44 49
45 // Create our audio decoders and renderer. 50 // Create our audio decoders and renderer.
46 ScopedVector<AudioDecoder> audio_decoders; 51 ScopedVector<AudioDecoder> audio_decoders;
47 52
48 #if !defined(MEDIA_DISABLE_FFMPEG) 53 #if !defined(MEDIA_DISABLE_FFMPEG)
49 audio_decoders.push_back(new FFmpegAudioDecoder( 54 audio_decoders.push_back(new FFmpegAudioDecoder(
50 media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_))); 55 media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_)));
51 #endif 56 #endif
52 57
58 #if !defined(OS_ANDROID)
53 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); 59 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
60 #endif
54 61
55 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( 62 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
56 media_task_runner, audio_renderer_sink, audio_decoders.Pass(), 63 media_task_runner, audio_renderer_sink, audio_decoders.Pass(),
57 audio_hardware_config_, media_log_)); 64 audio_hardware_config_, media_log_));
58 65
59 // Create our video decoders and renderer. 66 // Create our video decoders and renderer.
60 ScopedVector<VideoDecoder> video_decoders; 67 ScopedVector<VideoDecoder> video_decoders;
61 68
62 // |gpu_factories_| requires that its entry points be called on its 69 // |gpu_factories_| requires that its entry points be called on its
63 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the 70 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the
(...skipping 15 matching lines...) Expand all
79 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 86 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
80 media_task_runner, video_renderer_sink, video_decoders.Pass(), true, 87 media_task_runner, video_renderer_sink, video_decoders.Pass(), true,
81 gpu_factories_, media_log_)); 88 gpu_factories_, media_log_));
82 89
83 // Create renderer. 90 // Create renderer.
84 return scoped_ptr<Renderer>(new RendererImpl( 91 return scoped_ptr<Renderer>(new RendererImpl(
85 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); 92 media_task_runner, audio_renderer.Pass(), video_renderer.Pass()));
86 } 93 }
87 94
88 } // namespace media 95 } // namespace media
OLDNEW
« media/BUILD.gn ('K') | « media/mojo/services/mojo_renderer_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698