Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Side by Side Diff: media/renderers/default_renderer_factory.cc

Issue 1942803002: Caching AudioOutputDevice instances in mixer manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, fix for sleep() compile error on win and a bit of cleanup around timeouts. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 17 matching lines...) Expand all
28 28
29 #if !defined(MEDIA_DISABLE_LIBVPX) 29 #if !defined(MEDIA_DISABLE_LIBVPX)
30 #include "media/filters/vpx_video_decoder.h" 30 #include "media/filters/vpx_video_decoder.h"
31 #endif 31 #endif
32 32
33 namespace media { 33 namespace media {
34 34
35 DefaultRendererFactory::DefaultRendererFactory( 35 DefaultRendererFactory::DefaultRendererFactory(
36 const scoped_refptr<MediaLog>& media_log, 36 const scoped_refptr<MediaLog>& media_log,
37 DecoderFactory* decoder_factory, 37 DecoderFactory* decoder_factory,
38 const GetGpuFactoriesCB& get_gpu_factories_cb, 38 const GetGpuFactoriesCB& get_gpu_factories_cb)
39 const AudioHardwareConfig& audio_hardware_config)
40 : media_log_(media_log), 39 : media_log_(media_log),
41 decoder_factory_(decoder_factory), 40 decoder_factory_(decoder_factory),
42 get_gpu_factories_cb_(get_gpu_factories_cb), 41 get_gpu_factories_cb_(get_gpu_factories_cb) {}
43 audio_hardware_config_(audio_hardware_config) {}
44 42
45 DefaultRendererFactory::~DefaultRendererFactory() { 43 DefaultRendererFactory::~DefaultRendererFactory() {
46 } 44 }
47 45
48 ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders( 46 ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders(
49 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner) { 47 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner) {
50 // Create our audio decoders and renderer. 48 // Create our audio decoders and renderer.
51 ScopedVector<AudioDecoder> audio_decoders; 49 ScopedVector<AudioDecoder> audio_decoders;
52 50
53 #if !defined(MEDIA_DISABLE_FFMPEG) 51 #if !defined(MEDIA_DISABLE_FFMPEG)
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 97 }
100 98
101 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer( 99 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
102 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 100 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
103 const scoped_refptr<base::TaskRunner>& worker_task_runner, 101 const scoped_refptr<base::TaskRunner>& worker_task_runner,
104 AudioRendererSink* audio_renderer_sink, 102 AudioRendererSink* audio_renderer_sink,
105 VideoRendererSink* video_renderer_sink, 103 VideoRendererSink* video_renderer_sink,
106 const RequestSurfaceCB& request_surface_cb) { 104 const RequestSurfaceCB& request_surface_cb) {
107 DCHECK(audio_renderer_sink); 105 DCHECK(audio_renderer_sink);
108 106
109 std::unique_ptr<AudioRenderer> audio_renderer( 107 std::unique_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
110 new AudioRendererImpl(media_task_runner, audio_renderer_sink, 108 media_task_runner, audio_renderer_sink,
111 CreateAudioDecoders(media_task_runner), 109 CreateAudioDecoders(media_task_runner), media_log_));
112 audio_hardware_config_, media_log_));
113 110
114 GpuVideoAcceleratorFactories* gpu_factories = nullptr; 111 GpuVideoAcceleratorFactories* gpu_factories = nullptr;
115 if (!get_gpu_factories_cb_.is_null()) 112 if (!get_gpu_factories_cb_.is_null())
116 gpu_factories = get_gpu_factories_cb_.Run(); 113 gpu_factories = get_gpu_factories_cb_.Run();
117 114
118 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 115 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
119 media_task_runner, worker_task_runner, video_renderer_sink, 116 media_task_runner, worker_task_runner, video_renderer_sink,
120 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), 117 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories),
121 true, gpu_factories, media_log_)); 118 true, gpu_factories, media_log_));
122 119
123 return base::WrapUnique(new RendererImpl( 120 return base::WrapUnique(new RendererImpl(
124 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); 121 media_task_runner, std::move(audio_renderer), std::move(video_renderer)));
125 } 122 }
126 123
127 } // namespace media 124 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698