| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); | 69 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); |
| 70 | 70 |
| 71 #if !defined(MEDIA_DISABLE_LIBVPX) | 71 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 72 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); | 72 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); |
| 73 #endif | 73 #endif |
| 74 | 74 |
| 75 #if !defined(MEDIA_DISABLE_FFMPEG) | 75 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 76 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); | 76 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); |
| 77 #endif | 77 #endif |
| 78 | 78 |
| 79 scoped_ptr<VideoRenderer> video_renderer( | 79 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 80 new VideoRendererImpl(media_task_runner, video_renderer_sink, | 80 media_task_runner, video_renderer_sink, video_decoders.Pass(), true, |
| 81 video_decoders.Pass(), true, media_log_)); | 81 gpu_factories_, media_log_)); |
| 82 | 82 |
| 83 // Create renderer. | 83 // Create renderer. |
| 84 return scoped_ptr<Renderer>(new RendererImpl( | 84 return scoped_ptr<Renderer>(new RendererImpl( |
| 85 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 85 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace media | 88 } // namespace media |
| OLD | NEW |