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" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 return audio_decoders; | 65 return audio_decoders; |
66 } | 66 } |
67 | 67 |
68 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( | 68 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( |
69 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 69 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
70 const RequestSurfaceCB& request_surface_cb, | 70 const RequestSurfaceCB& request_surface_cb, |
71 GpuVideoAcceleratorFactories* gpu_factories) { | 71 GpuVideoAcceleratorFactories* gpu_factories) { |
72 // Create our video decoders and renderer. | 72 // Create our video decoders and renderer. |
73 ScopedVector<VideoDecoder> video_decoders; | 73 ScopedVector<VideoDecoder> video_decoders; |
74 | 74 |
75 // |gpu_factories_| requires that its entry points be called on its | |
76 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | |
77 // factories, require that their message loops are identical. | |
78 DCHECK(!gpu_factories || | |
79 (gpu_factories->GetTaskRunner() == media_task_runner.get())); | |
80 | |
81 // Prefer an external decoder since one will only exist if it is hardware | 75 // Prefer an external decoder since one will only exist if it is hardware |
82 // accelerated. | 76 // accelerated. |
83 if (gpu_factories) { | 77 if (gpu_factories) { |
| 78 // |gpu_factories_| requires that its entry points be called on its |
| 79 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
| 80 // factories, require that their message loops are identical. |
| 81 DCHECK(gpu_factories->GetTaskRunner() == media_task_runner.get()); |
| 82 |
84 if (decoder_factory_) { | 83 if (decoder_factory_) { |
85 decoder_factory_->CreateVideoDecoders(media_task_runner, gpu_factories, | 84 decoder_factory_->CreateVideoDecoders(media_task_runner, gpu_factories, |
86 &video_decoders); | 85 &video_decoders); |
87 } | 86 } |
88 video_decoders.push_back( | 87 video_decoders.push_back( |
89 new GpuVideoDecoder(gpu_factories, request_surface_cb)); | 88 new GpuVideoDecoder(gpu_factories, request_surface_cb)); |
90 } | 89 } |
91 | 90 |
92 #if !defined(MEDIA_DISABLE_LIBVPX) | 91 #if !defined(MEDIA_DISABLE_LIBVPX) |
93 video_decoders.push_back(new VpxVideoDecoder()); | 92 video_decoders.push_back(new VpxVideoDecoder()); |
(...skipping 26 matching lines...) Expand all Loading... |
120 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 119 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
121 media_task_runner, worker_task_runner, video_renderer_sink, | 120 media_task_runner, worker_task_runner, video_renderer_sink, |
122 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 121 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
123 true, gpu_factories, media_log_)); | 122 true, gpu_factories, media_log_)); |
124 | 123 |
125 return base::WrapUnique(new RendererImpl( | 124 return base::WrapUnique(new RendererImpl( |
126 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 125 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
127 } | 126 } |
128 | 127 |
129 } // namespace media | 128 } // namespace media |
OLD | NEW |