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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 // Create our audio decoders and renderer. | 49 // Create our audio decoders and renderer. |
50 ScopedVector<AudioDecoder> audio_decoders; | 50 ScopedVector<AudioDecoder> audio_decoders; |
51 | 51 |
52 #if !defined(MEDIA_DISABLE_FFMPEG) | 52 #if !defined(MEDIA_DISABLE_FFMPEG) |
53 audio_decoders.push_back( | 53 audio_decoders.push_back( |
54 new FFmpegAudioDecoder(media_task_runner, media_log_)); | 54 new FFmpegAudioDecoder(media_task_runner, media_log_)); |
55 #endif | 55 #endif |
56 | 56 |
57 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); | 57 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); |
58 | 58 |
| 59 // Use an external decoder only if we cannot otherwise decode in the |
| 60 // renderer. |
59 if (decoder_factory_) | 61 if (decoder_factory_) |
60 decoder_factory_->CreateAudioDecoders(&audio_decoders); | 62 decoder_factory_->CreateAudioDecoders(&audio_decoders); |
61 | 63 |
62 return audio_decoders; | 64 return audio_decoders; |
63 } | 65 } |
64 | 66 |
65 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( | 67 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( |
66 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 68 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
67 const RequestSurfaceCB& request_surface_cb, | 69 const RequestSurfaceCB& request_surface_cb, |
68 GpuVideoAcceleratorFactories* gpu_factories) { | 70 GpuVideoAcceleratorFactories* gpu_factories) { |
69 // Create our video decoders and renderer. | 71 // Create our video decoders and renderer. |
70 ScopedVector<VideoDecoder> video_decoders; | 72 ScopedVector<VideoDecoder> video_decoders; |
71 | 73 |
| 74 // Prefer an external decoder since one will only exist if it is hardware |
| 75 // accelerated. |
| 76 if (decoder_factory_) |
| 77 decoder_factory_->CreateVideoDecoders(&video_decoders); |
| 78 |
72 // |gpu_factories_| requires that its entry points be called on its | 79 // |gpu_factories_| requires that its entry points be called on its |
73 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 80 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
74 // factories, require that their message loops are identical. | 81 // factories, require that their message loops are identical. |
75 DCHECK(!gpu_factories || | 82 DCHECK(!gpu_factories || |
76 (gpu_factories->GetTaskRunner() == media_task_runner.get())); | 83 (gpu_factories->GetTaskRunner() == media_task_runner.get())); |
77 | 84 |
78 if (gpu_factories) | 85 if (gpu_factories) |
79 video_decoders.push_back( | 86 video_decoders.push_back( |
80 new GpuVideoDecoder(gpu_factories, request_surface_cb)); | 87 new GpuVideoDecoder(gpu_factories, request_surface_cb)); |
81 | 88 |
82 #if !defined(MEDIA_DISABLE_LIBVPX) | 89 #if !defined(MEDIA_DISABLE_LIBVPX) |
83 video_decoders.push_back(new VpxVideoDecoder()); | 90 video_decoders.push_back(new VpxVideoDecoder()); |
84 #endif | 91 #endif |
85 | 92 |
86 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 93 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
87 video_decoders.push_back(new FFmpegVideoDecoder()); | 94 video_decoders.push_back(new FFmpegVideoDecoder()); |
88 #endif | 95 #endif |
89 | 96 |
90 if (decoder_factory_) | |
91 decoder_factory_->CreateVideoDecoders(&video_decoders); | |
92 | |
93 return video_decoders; | 97 return video_decoders; |
94 } | 98 } |
95 | 99 |
96 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 100 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
97 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 101 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
98 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 102 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
99 AudioRendererSink* audio_renderer_sink, | 103 AudioRendererSink* audio_renderer_sink, |
100 VideoRendererSink* video_renderer_sink, | 104 VideoRendererSink* video_renderer_sink, |
101 const RequestSurfaceCB& request_surface_cb) { | 105 const RequestSurfaceCB& request_surface_cb) { |
102 DCHECK(audio_renderer_sink); | 106 DCHECK(audio_renderer_sink); |
(...skipping 10 matching lines...) Expand all Loading... |
113 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 117 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
114 media_task_runner, worker_task_runner, video_renderer_sink, | 118 media_task_runner, worker_task_runner, video_renderer_sink, |
115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 119 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
116 true, gpu_factories, media_log_)); | 120 true, gpu_factories, media_log_)); |
117 | 121 |
118 return scoped_ptr<Renderer>(new RendererImpl( | 122 return scoped_ptr<Renderer>(new RendererImpl( |
119 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 123 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
120 } | 124 } |
121 | 125 |
122 } // namespace media | 126 } // namespace media |
OLD | NEW |