| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "media/base/decoder_factory.h" | 13 #include "media/base/decoder_factory.h" |
| 14 #include "media/base/media_log.h" | 14 #include "media/base/media_log.h" |
| 15 #include "media/base/video_frame_provider.h" |
| 15 #include "media/filters/gpu_video_decoder.h" | 16 #include "media/filters/gpu_video_decoder.h" |
| 16 #include "media/renderers/audio_renderer_impl.h" | 17 #include "media/renderers/audio_renderer_impl.h" |
| 17 #include "media/renderers/gpu_video_accelerator_factories.h" | 18 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 18 #include "media/renderers/renderer_impl.h" | 19 #include "media/renderers/renderer_impl.h" |
| 19 #include "media/renderers/video_renderer_impl.h" | 20 #include "media/renderers/video_renderer_impl.h" |
| 20 | 21 |
| 21 #if !defined(MEDIA_DISABLE_FFMPEG) | 22 #if !defined(MEDIA_DISABLE_FFMPEG) |
| 22 #include "media/filters/ffmpeg_audio_decoder.h" | 23 #include "media/filters/ffmpeg_audio_decoder.h" |
| 23 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 24 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
| 24 #include "media/filters/ffmpeg_video_decoder.h" | 25 #include "media/filters/ffmpeg_video_decoder.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 114 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 114 media_task_runner, worker_task_runner, video_renderer_sink, | 115 media_task_runner, worker_task_runner, video_renderer_sink, |
| 115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 116 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
| 116 true, gpu_factories, media_log_)); | 117 true, gpu_factories, media_log_)); |
| 117 | 118 |
| 118 return base::MakeUnique<RendererImpl>( | 119 return base::MakeUnique<RendererImpl>( |
| 119 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); | 120 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); |
| 120 } | 121 } |
| 121 | 122 |
| 122 } // namespace media | 123 } // namespace media |
| OLD | NEW |