| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | 59 // Use an external decoder only if we cannot otherwise decode in the |
| 60 // renderer. | 60 // renderer. |
| 61 if (decoder_factory_) | 61 if (decoder_factory_) |
| 62 decoder_factory_->CreateAudioDecoders(&audio_decoders); | 62 decoder_factory_->CreateAudioDecoders(media_task_runner, &audio_decoders); |
| 63 | 63 |
| 64 return audio_decoders; | 64 return audio_decoders; |
| 65 } | 65 } |
| 66 | 66 |
| 67 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( | 67 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders( |
| 68 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 68 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 69 const RequestSurfaceCB& request_surface_cb, | 69 const RequestSurfaceCB& request_surface_cb, |
| 70 GpuVideoAcceleratorFactories* gpu_factories) { | 70 GpuVideoAcceleratorFactories* gpu_factories) { |
| 71 // Create our video decoders and renderer. | 71 // Create our video decoders and renderer. |
| 72 ScopedVector<VideoDecoder> video_decoders; | 72 ScopedVector<VideoDecoder> video_decoders; |
| 73 | 73 |
| 74 // Prefer an external decoder since one will only exist if it is hardware | 74 // Prefer an external decoder since one will only exist if it is hardware |
| 75 // accelerated. | 75 // accelerated. |
| 76 if (decoder_factory_) | 76 if (decoder_factory_) |
| 77 decoder_factory_->CreateVideoDecoders(&video_decoders); | 77 decoder_factory_->CreateVideoDecoders(media_task_runner, &video_decoders); |
| 78 | 78 |
| 79 // |gpu_factories_| requires that its entry points be called on its | 79 // |gpu_factories_| requires that its entry points be called on its |
| 80 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 80 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
| 81 // factories, require that their message loops are identical. | 81 // factories, require that their message loops are identical. |
| 82 DCHECK(!gpu_factories || | 82 DCHECK(!gpu_factories || |
| 83 (gpu_factories->GetTaskRunner() == media_task_runner.get())); | 83 (gpu_factories->GetTaskRunner() == media_task_runner.get())); |
| 84 | 84 |
| 85 if (gpu_factories) | 85 if (gpu_factories) |
| 86 video_decoders.push_back( | 86 video_decoders.push_back( |
| 87 new GpuVideoDecoder(gpu_factories, request_surface_cb)); | 87 new GpuVideoDecoder(gpu_factories, request_surface_cb)); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 117 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 117 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
| 118 media_task_runner, worker_task_runner, video_renderer_sink, | 118 media_task_runner, worker_task_runner, video_renderer_sink, |
| 119 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 119 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
| 120 true, gpu_factories, media_log_)); | 120 true, gpu_factories, media_log_)); |
| 121 | 121 |
| 122 return scoped_ptr<Renderer>(new RendererImpl( | 122 return scoped_ptr<Renderer>(new RendererImpl( |
| 123 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 123 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
| 124 } | 124 } |
| 125 | 125 |
| 126 } // namespace media | 126 } // namespace media |
| OLD | NEW |