| 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/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 "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #if !defined(MEDIA_DISABLE_FFMPEG) | 9 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 10 #include "media/base/media_log.h" | 10 #include "media/base/media_log.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 gpu_factories_(gpu_factories), | 31 gpu_factories_(gpu_factories), |
| 32 audio_hardware_config_(audio_hardware_config) { | 32 audio_hardware_config_(audio_hardware_config) { |
| 33 } | 33 } |
| 34 | 34 |
| 35 DefaultRendererFactory::~DefaultRendererFactory() { | 35 DefaultRendererFactory::~DefaultRendererFactory() { |
| 36 } | 36 } |
| 37 | 37 |
| 38 // TODO(xhwang): Use RendererConfig to customize what decoders we use. | 38 // TODO(xhwang): Use RendererConfig to customize what decoders we use. |
| 39 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 39 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
| 40 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 40 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 41 AudioRendererSink* audio_renderer_sink, | 41 AudioRendererSink* audio_renderer_sink) { |
| 42 VideoRendererSink* video_renderer_sink) { | |
| 43 DCHECK(audio_renderer_sink); | 42 DCHECK(audio_renderer_sink); |
| 44 | 43 |
| 45 // Create our audio decoders and renderer. | 44 // Create our audio decoders and renderer. |
| 46 ScopedVector<AudioDecoder> audio_decoders; | 45 ScopedVector<AudioDecoder> audio_decoders; |
| 47 | 46 |
| 48 #if !defined(MEDIA_DISABLE_FFMPEG) | 47 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 49 audio_decoders.push_back(new FFmpegAudioDecoder( | 48 audio_decoders.push_back(new FFmpegAudioDecoder( |
| 50 media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_))); | 49 media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_))); |
| 51 #endif | 50 #endif |
| 52 | 51 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 69 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); | 68 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); |
| 70 | 69 |
| 71 #if !defined(MEDIA_DISABLE_LIBVPX) | 70 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 72 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); | 71 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); |
| 73 #endif | 72 #endif |
| 74 | 73 |
| 75 #if !defined(MEDIA_DISABLE_FFMPEG) | 74 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 76 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); | 75 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); |
| 77 #endif | 76 #endif |
| 78 | 77 |
| 79 scoped_ptr<VideoRenderer> video_renderer( | 78 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 80 new VideoRendererImpl(media_task_runner, video_renderer_sink, | 79 media_task_runner, video_decoders.Pass(), true, media_log_)); |
| 81 video_decoders.Pass(), true, media_log_)); | |
| 82 | 80 |
| 83 // Create renderer. | 81 // Create renderer. |
| 84 return scoped_ptr<Renderer>(new RendererImpl( | 82 return scoped_ptr<Renderer>(new RendererImpl( |
| 85 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 83 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
| 86 } | 84 } |
| 87 | 85 |
| 88 } // namespace media | 86 } // namespace media |
| OLD | NEW |