| 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/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 #include "media/filters/audio_renderer_impl.h" | |
| 10 #if !defined(MEDIA_DISABLE_FFMPEG) | 9 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 11 #include "media/filters/ffmpeg_audio_decoder.h" | 10 #include "media/filters/ffmpeg_audio_decoder.h" |
| 12 #include "media/filters/ffmpeg_video_decoder.h" | 11 #include "media/filters/ffmpeg_video_decoder.h" |
| 13 #endif | 12 #endif |
| 14 #include "media/filters/gpu_video_accelerator_factories.h" | 13 #include "media/filters/gpu_video_accelerator_factories.h" |
| 15 #include "media/filters/gpu_video_decoder.h" | 14 #include "media/filters/gpu_video_decoder.h" |
| 16 #include "media/filters/opus_audio_decoder.h" | 15 #include "media/filters/opus_audio_decoder.h" |
| 17 #include "media/filters/renderer_impl.h" | 16 #include "media/renderers/audio_renderer_impl.h" |
| 18 #include "media/filters/video_renderer_impl.h" | 17 #include "media/renderers/renderer_impl.h" |
| 18 #include "media/renderers/video_renderer_impl.h" |
| 19 #if !defined(MEDIA_DISABLE_LIBVPX) | 19 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 20 #include "media/filters/vpx_video_decoder.h" | 20 #include "media/filters/vpx_video_decoder.h" |
| 21 #endif | 21 #endif |
| 22 | 22 |
| 23 namespace media { | 23 namespace media { |
| 24 | 24 |
| 25 #if !defined(MEDIA_DISABLE_FFMPEG) | 25 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 26 // TODO(xhwang): We are abusing CreateMediaSourceErrorEvent() in a lot of places | 26 // TODO(xhwang): We are abusing CreateMediaSourceErrorEvent() in a lot of places |
| 27 // that are not MediaSource related. Fix this in a separate CL. | 27 // that are not MediaSource related. Fix this in a separate CL. |
| 28 static void LogError(const scoped_refptr<MediaLog>& media_log, | 28 static void LogError(const scoped_refptr<MediaLog>& media_log, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 85 |
| 86 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 86 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 87 media_task_runner, video_decoders.Pass(), true, media_log_)); | 87 media_task_runner, video_decoders.Pass(), true, media_log_)); |
| 88 | 88 |
| 89 // Create renderer. | 89 // Create renderer. |
| 90 return scoped_ptr<Renderer>(new RendererImpl( | 90 return scoped_ptr<Renderer>(new RendererImpl( |
| 91 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 91 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace media | 94 } // namespace media |
| OLD | NEW |