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 10 matching lines...) Expand all Loading... | |
21 #include "media/filters/ffmpeg_audio_decoder.h" | 21 #include "media/filters/ffmpeg_audio_decoder.h" |
22 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 22 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
23 #include "media/filters/ffmpeg_video_decoder.h" | 23 #include "media/filters/ffmpeg_video_decoder.h" |
24 #endif | 24 #endif |
25 #endif | 25 #endif |
26 | 26 |
27 #if !defined(MEDIA_DISABLE_LIBVPX) | 27 #if !defined(MEDIA_DISABLE_LIBVPX) |
28 #include "media/filters/vpx_video_decoder.h" | 28 #include "media/filters/vpx_video_decoder.h" |
29 #endif | 29 #endif |
30 | 30 |
31 #if defined(OS_ANDROID) | |
32 #include "media/filters/android/android_audio_decoder.h" | |
33 #endif | |
34 | |
31 namespace media { | 35 namespace media { |
32 | 36 |
33 DefaultRendererFactory::DefaultRendererFactory( | 37 DefaultRendererFactory::DefaultRendererFactory( |
34 const scoped_refptr<MediaLog>& media_log, | 38 const scoped_refptr<MediaLog>& media_log, |
35 GpuVideoAcceleratorFactories* gpu_factories, | 39 GpuVideoAcceleratorFactories* gpu_factories, |
36 const AudioHardwareConfig& audio_hardware_config) | 40 const AudioHardwareConfig& audio_hardware_config) |
37 : media_log_(media_log), | 41 : media_log_(media_log), |
38 gpu_factories_(gpu_factories), | 42 gpu_factories_(gpu_factories), |
39 audio_hardware_config_(audio_hardware_config) {} | 43 audio_hardware_config_(audio_hardware_config) {} |
40 | 44 |
(...skipping 10 matching lines...) Expand all Loading... | |
51 // Create our audio decoders and renderer. | 55 // Create our audio decoders and renderer. |
52 ScopedVector<AudioDecoder> audio_decoders; | 56 ScopedVector<AudioDecoder> audio_decoders; |
53 | 57 |
54 #if !defined(MEDIA_DISABLE_FFMPEG) | 58 #if !defined(MEDIA_DISABLE_FFMPEG) |
55 audio_decoders.push_back( | 59 audio_decoders.push_back( |
56 new FFmpegAudioDecoder(media_task_runner, media_log_)); | 60 new FFmpegAudioDecoder(media_task_runner, media_log_)); |
57 #endif | 61 #endif |
58 | 62 |
59 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); | 63 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); |
60 | 64 |
65 #if defined(OS_ANDROID) | |
66 // TODO(timav): replace AndroidAudioDecoder with MojoAudioDecoder. | |
67 audio_decoders.push_back(new AndroidAudioDecoder(media_task_runner)); | |
68 #endif | |
xhwang
2016/02/08 20:03:35
Thanks!
This probably should not be checked in b
Tima Vaisburd
2016/02/11 20:23:23
All changes to this file are removed.
| |
69 | |
61 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( | 70 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( |
62 media_task_runner, audio_renderer_sink, std::move(audio_decoders), | 71 media_task_runner, audio_renderer_sink, std::move(audio_decoders), |
63 audio_hardware_config_, media_log_)); | 72 audio_hardware_config_, media_log_)); |
64 | 73 |
65 // Create our video decoders and renderer. | 74 // Create our video decoders and renderer. |
66 ScopedVector<VideoDecoder> video_decoders; | 75 ScopedVector<VideoDecoder> video_decoders; |
67 | 76 |
68 // |gpu_factories_| requires that its entry points be called on its | 77 // |gpu_factories_| requires that its entry points be called on its |
69 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 78 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
70 // factories, require that their message loops are identical. | 79 // factories, require that their message loops are identical. |
(...skipping 14 matching lines...) Expand all Loading... | |
85 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 94 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
86 media_task_runner, worker_task_runner, video_renderer_sink, | 95 media_task_runner, worker_task_runner, video_renderer_sink, |
87 std::move(video_decoders), true, gpu_factories_, media_log_)); | 96 std::move(video_decoders), true, gpu_factories_, media_log_)); |
88 | 97 |
89 // Create renderer. | 98 // Create renderer. |
90 return scoped_ptr<Renderer>(new RendererImpl( | 99 return scoped_ptr<Renderer>(new RendererImpl( |
91 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 100 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
92 } | 101 } |
93 | 102 |
94 } // namespace media | 103 } // namespace media |
OLD | NEW |