| 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" |
| 11 #include "media/filters/ffmpeg_audio_decoder.h" | 11 #include "media/filters/ffmpeg_audio_decoder.h" |
| 12 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
| 12 #include "media/filters/ffmpeg_video_decoder.h" | 13 #include "media/filters/ffmpeg_video_decoder.h" |
| 13 #endif | 14 #endif |
| 15 #endif |
| 14 #include "media/filters/gpu_video_decoder.h" | 16 #include "media/filters/gpu_video_decoder.h" |
| 15 #include "media/filters/opus_audio_decoder.h" | 17 #include "media/filters/opus_audio_decoder.h" |
| 16 #include "media/renderers/audio_renderer_impl.h" | 18 #include "media/renderers/audio_renderer_impl.h" |
| 17 #include "media/renderers/gpu_video_accelerator_factories.h" | 19 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 18 #include "media/renderers/renderer_impl.h" | 20 #include "media/renderers/renderer_impl.h" |
| 19 #include "media/renderers/video_renderer_impl.h" | 21 #include "media/renderers/video_renderer_impl.h" |
| 20 #if !defined(MEDIA_DISABLE_LIBVPX) | 22 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 21 #include "media/filters/vpx_video_decoder.h" | 23 #include "media/filters/vpx_video_decoder.h" |
| 22 #endif | 24 #endif |
| 23 | 25 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 DCHECK(!gpu_factories_.get() || | 67 DCHECK(!gpu_factories_.get() || |
| 66 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); | 68 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); |
| 67 | 69 |
| 68 if (gpu_factories_.get()) | 70 if (gpu_factories_.get()) |
| 69 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); | 71 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); |
| 70 | 72 |
| 71 #if !defined(MEDIA_DISABLE_LIBVPX) | 73 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 72 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); | 74 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); |
| 73 #endif | 75 #endif |
| 74 | 76 |
| 75 #if !defined(MEDIA_DISABLE_FFMPEG) | 77 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
| 76 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); | 78 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); |
| 77 #endif | 79 #endif |
| 78 | 80 |
| 79 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 81 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 80 media_task_runner, video_renderer_sink, video_decoders.Pass(), true, | 82 media_task_runner, video_renderer_sink, video_decoders.Pass(), true, |
| 81 gpu_factories_, media_log_)); | 83 gpu_factories_, media_log_)); |
| 82 | 84 |
| 83 // Create renderer. | 85 // Create renderer. |
| 84 return scoped_ptr<Renderer>(new RendererImpl( | 86 return scoped_ptr<Renderer>(new RendererImpl( |
| 85 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 87 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
| 86 } | 88 } |
| 87 | 89 |
| 88 } // namespace media | 90 } // namespace media |
| OLD | NEW |