| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 44 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
| 45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 46 AudioRendererSink* audio_renderer_sink, | 46 AudioRendererSink* audio_renderer_sink, |
| 47 VideoRendererSink* video_renderer_sink) { | 47 VideoRendererSink* video_renderer_sink) { |
| 48 DCHECK(audio_renderer_sink); | 48 DCHECK(audio_renderer_sink); |
| 49 | 49 |
| 50 // Create our audio decoders and renderer. | 50 // Create our audio decoders and renderer. |
| 51 ScopedVector<AudioDecoder> audio_decoders; | 51 ScopedVector<AudioDecoder> audio_decoders; |
| 52 | 52 |
| 53 #if !defined(MEDIA_DISABLE_FFMPEG) | 53 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 54 audio_decoders.push_back(new FFmpegAudioDecoder( | 54 audio_decoders.push_back( |
| 55 media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_))); | 55 new FFmpegAudioDecoder(media_task_runner, media_log_)); |
| 56 #endif | 56 #endif |
| 57 | 57 |
| 58 #if !defined(OS_ANDROID) | 58 #if !defined(OS_ANDROID) |
| 59 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); | 59 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); |
| 60 #endif | 60 #endif |
| 61 | 61 |
| 62 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( | 62 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( |
| 63 media_task_runner, audio_renderer_sink, audio_decoders.Pass(), | 63 media_task_runner, audio_renderer_sink, audio_decoders.Pass(), |
| 64 audio_hardware_config_, media_log_)); | 64 audio_hardware_config_, media_log_)); |
| 65 | 65 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 86 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 86 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 87 media_task_runner, video_renderer_sink, video_decoders.Pass(), true, | 87 media_task_runner, video_renderer_sink, video_decoders.Pass(), true, |
| 88 gpu_factories_, media_log_)); | 88 gpu_factories_, media_log_)); |
| 89 | 89 |
| 90 // Create renderer. | 90 // Create renderer. |
| 91 return scoped_ptr<Renderer>(new RendererImpl( | 91 return scoped_ptr<Renderer>(new RendererImpl( |
| 92 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 92 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
| 93 } | 93 } |
| 94 | 94 |
| 95 } // namespace media | 95 } // namespace media |
| OLD | NEW |