Chromium Code Reviews| 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/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 return audio_decoders; | 62 return audio_decoders; |
| 63 } | 63 } |
| 64 | 64 |
| 65 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( | 65 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( |
| 66 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 66 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 67 const RequestSurfaceCB& request_surface_cb, | 67 const RequestSurfaceCB& request_surface_cb, |
| 68 GpuVideoAcceleratorFactories* gpu_factories) { | 68 GpuVideoAcceleratorFactories* gpu_factories) { |
| 69 // Create our video decoders and renderer. | 69 // Create our video decoders and renderer. |
| 70 ScopedVector<VideoDecoder> video_decoders; | 70 ScopedVector<VideoDecoder> video_decoders; |
| 71 | 71 |
| 72 if (decoder_factory_) | |
| 73 decoder_factory_->CreateVideoDecoders(&video_decoders); | |
|
xhwang
2016/03/15 05:13:18
Add a comment why we like to put this as the first
sandersd (OOO until July 31)
2016/03/15 18:31:02
Done.
| |
| 74 | |
| 72 // |gpu_factories_| requires that its entry points be called on its | 75 // |gpu_factories_| requires that its entry points be called on its |
| 73 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 76 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
| 74 // factories, require that their message loops are identical. | 77 // factories, require that their message loops are identical. |
| 75 DCHECK(!gpu_factories || | 78 DCHECK(!gpu_factories || |
| 76 (gpu_factories->GetTaskRunner() == media_task_runner.get())); | 79 (gpu_factories->GetTaskRunner() == media_task_runner.get())); |
| 77 | 80 |
| 78 if (gpu_factories) | 81 if (gpu_factories) |
| 79 video_decoders.push_back( | 82 video_decoders.push_back( |
| 80 new GpuVideoDecoder(gpu_factories, request_surface_cb)); | 83 new GpuVideoDecoder(gpu_factories, request_surface_cb)); |
| 81 | 84 |
| 82 #if !defined(MEDIA_DISABLE_LIBVPX) | 85 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 83 video_decoders.push_back(new VpxVideoDecoder()); | 86 video_decoders.push_back(new VpxVideoDecoder()); |
| 84 #endif | 87 #endif |
| 85 | 88 |
| 86 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 89 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
| 87 video_decoders.push_back(new FFmpegVideoDecoder()); | 90 video_decoders.push_back(new FFmpegVideoDecoder()); |
| 88 #endif | 91 #endif |
| 89 | 92 |
| 90 if (decoder_factory_) | |
| 91 decoder_factory_->CreateVideoDecoders(&video_decoders); | |
| 92 | |
| 93 return video_decoders; | 93 return video_decoders; |
| 94 } | 94 } |
| 95 | 95 |
| 96 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 96 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
| 97 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 97 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 98 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 98 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| 99 AudioRendererSink* audio_renderer_sink, | 99 AudioRendererSink* audio_renderer_sink, |
| 100 VideoRendererSink* video_renderer_sink, | 100 VideoRendererSink* video_renderer_sink, |
| 101 const RequestSurfaceCB& request_surface_cb) { | 101 const RequestSurfaceCB& request_surface_cb) { |
| 102 DCHECK(audio_renderer_sink); | 102 DCHECK(audio_renderer_sink); |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 113 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 113 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 114 media_task_runner, worker_task_runner, video_renderer_sink, | 114 media_task_runner, worker_task_runner, video_renderer_sink, |
| 115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
| 116 true, gpu_factories, media_log_)); | 116 true, gpu_factories, media_log_)); |
| 117 | 117 |
| 118 return scoped_ptr<Renderer>(new RendererImpl( | 118 return scoped_ptr<Renderer>(new RendererImpl( |
| 119 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 119 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
| 120 } | 120 } |
| 121 | 121 |
| 122 } // namespace media | 122 } // namespace media |
| OLD | NEW |