OLD | NEW |
---|---|
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/filters/default_renderer_factory.h" | 5 #include "media/filters/default_renderer_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "media/filters/audio_renderer_impl.h" | 9 #include "media/filters/audio_renderer_impl.h" |
10 #if !defined(MEDIA_DISABLE_FFMPEG) | |
10 #include "media/filters/ffmpeg_audio_decoder.h" | 11 #include "media/filters/ffmpeg_audio_decoder.h" |
11 #include "media/filters/ffmpeg_video_decoder.h" | 12 #include "media/filters/ffmpeg_video_decoder.h" |
13 #endif // !MEDIA_DISABLE_FFMPEG | |
xhwang
2015/01/07 20:42:30
nit: Usually we use !defined(MEDIA_DISABLE_FFMPEG)
Mostyn Bramley-Moore
2015/01/07 20:54:43
Done.
| |
12 #include "media/filters/gpu_video_accelerator_factories.h" | 14 #include "media/filters/gpu_video_accelerator_factories.h" |
13 #include "media/filters/gpu_video_decoder.h" | 15 #include "media/filters/gpu_video_decoder.h" |
14 #include "media/filters/opus_audio_decoder.h" | 16 #include "media/filters/opus_audio_decoder.h" |
15 #include "media/filters/renderer_impl.h" | 17 #include "media/filters/renderer_impl.h" |
16 #include "media/filters/video_renderer_impl.h" | 18 #include "media/filters/video_renderer_impl.h" |
19 #if !defined(MEDIA_DISABLE_LIBVPX) | |
17 #include "media/filters/vpx_video_decoder.h" | 20 #include "media/filters/vpx_video_decoder.h" |
21 #endif // !MEDIA_DISABLE_LIBVPX | |
18 | 22 |
19 namespace media { | 23 namespace media { |
20 | 24 |
25 #if !defined(MEDIA_DISABLE_FFMPEG) | |
21 // TODO(xhwang): We are abusing CreateMediaSourceErrorEvent() in a lot of places | 26 // TODO(xhwang): We are abusing CreateMediaSourceErrorEvent() in a lot of places |
22 // that are not MediaSource related. Fix this in a separate CL. | 27 // that are not MediaSource related. Fix this in a separate CL. |
23 static void LogError(const scoped_refptr<MediaLog>& media_log, | 28 static void LogError(const scoped_refptr<MediaLog>& media_log, |
24 const std::string& error) { | 29 const std::string& error) { |
25 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error)); | 30 media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error)); |
26 } | 31 } |
32 #endif // !MEDIA_DISABLE_FFMPEG | |
27 | 33 |
28 DefaultRendererFactory::DefaultRendererFactory( | 34 DefaultRendererFactory::DefaultRendererFactory( |
29 const scoped_refptr<MediaLog>& media_log, | 35 const scoped_refptr<MediaLog>& media_log, |
30 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories, | 36 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories, |
31 const AudioHardwareConfig& audio_hardware_config) | 37 const AudioHardwareConfig& audio_hardware_config) |
32 : media_log_(media_log), | 38 : media_log_(media_log), |
33 gpu_factories_(gpu_factories), | 39 gpu_factories_(gpu_factories), |
34 audio_hardware_config_(audio_hardware_config) { | 40 audio_hardware_config_(audio_hardware_config) { |
35 } | 41 } |
36 | 42 |
37 DefaultRendererFactory::~DefaultRendererFactory() { | 43 DefaultRendererFactory::~DefaultRendererFactory() { |
38 } | 44 } |
39 | 45 |
40 // TODO(xhwang): Use RendererConfig to customize what decoders we use. | 46 // TODO(xhwang): Use RendererConfig to customize what decoders we use. |
41 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 47 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
42 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 48 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
43 AudioRendererSink* audio_renderer_sink) { | 49 AudioRendererSink* audio_renderer_sink) { |
44 DCHECK(audio_renderer_sink); | 50 DCHECK(audio_renderer_sink); |
45 | 51 |
46 // Create our audio decoders and renderer. | 52 // Create our audio decoders and renderer. |
47 ScopedVector<AudioDecoder> audio_decoders; | 53 ScopedVector<AudioDecoder> audio_decoders; |
48 | 54 |
55 #if !defined(MEDIA_DISABLE_FFMPEG) | |
49 audio_decoders.push_back(new FFmpegAudioDecoder( | 56 audio_decoders.push_back(new FFmpegAudioDecoder( |
50 media_task_runner, base::Bind(&LogError, media_log_))); | 57 media_task_runner, base::Bind(&LogError, media_log_))); |
58 #endif // !MEDIA_DISABLE_FFMPEG | |
59 | |
51 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); | 60 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); |
52 | 61 |
53 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( | 62 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( |
54 media_task_runner, audio_renderer_sink, audio_decoders.Pass(), | 63 media_task_runner, audio_renderer_sink, audio_decoders.Pass(), |
55 audio_hardware_config_, media_log_)); | 64 audio_hardware_config_, media_log_)); |
56 | 65 |
57 // Create our video decoders and renderer. | 66 // Create our video decoders and renderer. |
58 ScopedVector<VideoDecoder> video_decoders; | 67 ScopedVector<VideoDecoder> video_decoders; |
59 | 68 |
60 // |gpu_factories_| requires that its entry points be called on its | 69 // |gpu_factories_| requires that its entry points be called on its |
61 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 70 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
62 // factories, require that their message loops are identical. | 71 // factories, require that their message loops are identical. |
63 DCHECK(!gpu_factories_.get() || | 72 DCHECK(!gpu_factories_.get() || |
64 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); | 73 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); |
65 | 74 |
66 if (gpu_factories_.get()) | 75 if (gpu_factories_.get()) |
67 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); | 76 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); |
68 | 77 |
69 #if !defined(MEDIA_DISABLE_LIBVPX) | 78 #if !defined(MEDIA_DISABLE_LIBVPX) |
70 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); | 79 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); |
71 #endif // !defined(MEDIA_DISABLE_LIBVPX) | 80 #endif // !defined(MEDIA_DISABLE_LIBVPX) |
72 | 81 |
82 #if !defined(MEDIA_DISABLE_FFMPEG) | |
73 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); | 83 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); |
84 #endif // !MEDIA_DISABLE_FFMPEG | |
74 | 85 |
75 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 86 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
76 media_task_runner, video_decoders.Pass(), true, media_log_)); | 87 media_task_runner, video_decoders.Pass(), true, media_log_)); |
77 | 88 |
78 // Create renderer. | 89 // Create renderer. |
79 return scoped_ptr<Renderer>(new RendererImpl( | 90 return scoped_ptr<Renderer>(new RendererImpl( |
80 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 91 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
81 } | 92 } |
82 | 93 |
83 } // namespace media | 94 } // namespace media |
OLD | NEW |