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 "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "media/base/media_log.h" | 10 #include "media/base/media_log.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 : media_log_(media_log), | 38 : media_log_(media_log), |
39 gpu_factories_(gpu_factories), | 39 gpu_factories_(gpu_factories), |
40 audio_hardware_config_(audio_hardware_config) { | 40 audio_hardware_config_(audio_hardware_config) { |
41 } | 41 } |
42 | 42 |
43 DefaultRendererFactory::~DefaultRendererFactory() { | 43 DefaultRendererFactory::~DefaultRendererFactory() { |
44 } | 44 } |
45 | 45 |
46 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 46 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
47 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 47 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 48 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
48 AudioRendererSink* audio_renderer_sink, | 49 AudioRendererSink* audio_renderer_sink, |
49 VideoRendererSink* video_renderer_sink) { | 50 VideoRendererSink* video_renderer_sink) { |
50 DCHECK(audio_renderer_sink); | 51 DCHECK(audio_renderer_sink); |
51 | 52 |
52 // Create our audio decoders and renderer. | 53 // Create our audio decoders and renderer. |
53 ScopedVector<AudioDecoder> audio_decoders; | 54 ScopedVector<AudioDecoder> audio_decoders; |
54 | 55 |
55 #if !defined(MEDIA_DISABLE_FFMPEG) | 56 #if !defined(MEDIA_DISABLE_FFMPEG) |
56 audio_decoders.push_back( | 57 audio_decoders.push_back( |
57 new FFmpegAudioDecoder(media_task_runner, media_log_)); | 58 new FFmpegAudioDecoder(media_task_runner, media_log_)); |
(...skipping 21 matching lines...) Expand all Loading... |
79 | 80 |
80 #if !defined(MEDIA_DISABLE_LIBVPX) | 81 #if !defined(MEDIA_DISABLE_LIBVPX) |
81 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); | 82 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); |
82 #endif | 83 #endif |
83 | 84 |
84 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 85 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
85 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); | 86 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); |
86 #endif | 87 #endif |
87 | 88 |
88 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 89 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
89 media_task_runner, video_renderer_sink, video_decoders.Pass(), true, | 90 media_task_runner, worker_task_runner, video_renderer_sink, |
90 gpu_factories_, media_log_)); | 91 video_decoders.Pass(), true, gpu_factories_, media_log_)); |
91 | 92 |
92 // Create renderer. | 93 // Create renderer. |
93 return scoped_ptr<Renderer>(new RendererImpl( | 94 return scoped_ptr<Renderer>(new RendererImpl( |
94 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 95 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
95 } | 96 } |
96 | 97 |
97 } // namespace media | 98 } // namespace media |
OLD | NEW |