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

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

Issue 1094553002: Revert "Speculative revert by sheriff" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 #ifndef MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_ 5 #ifndef MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_
6 #define MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_ 6 #define MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "media/base/media_export.h" 9 #include "media/base/media_export.h"
10 #include "media/base/renderer_factory.h" 10 #include "media/base/renderer_factory.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 class AudioHardwareConfig; 14 class AudioHardwareConfig;
15 class AudioRendererSink; 15 class AudioRendererSink;
16 class GpuVideoAcceleratorFactories; 16 class GpuVideoAcceleratorFactories;
17 class MediaLog; 17 class MediaLog;
18 class VideoRendererSink;
18 19
19 // The default factory class for creating RendererImpl. 20 // The default factory class for creating RendererImpl.
20 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory { 21 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory {
21 public: 22 public:
22 DefaultRendererFactory( 23 DefaultRendererFactory(
23 const scoped_refptr<MediaLog>& media_log, 24 const scoped_refptr<MediaLog>& media_log,
24 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories, 25 const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
25 const AudioHardwareConfig& audio_hardware_config); 26 const AudioHardwareConfig& audio_hardware_config);
26 ~DefaultRendererFactory() final; 27 ~DefaultRendererFactory() final;
27 28
28 scoped_ptr<Renderer> CreateRenderer( 29 scoped_ptr<Renderer> CreateRenderer(
29 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 30 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
30 AudioRendererSink* audio_renderer_sink) final; 31 AudioRendererSink* audio_renderer_sink,
32 VideoRendererSink* video_renderer_sink) final;
31 33
32 private: 34 private:
33 scoped_refptr<MediaLog> media_log_; 35 scoped_refptr<MediaLog> media_log_;
34 36
35 // Factories for supporting video accelerators. May be null. 37 // Factories for supporting video accelerators. May be null.
36 scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories_; 38 scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories_;
37 39
38 const AudioHardwareConfig& audio_hardware_config_; 40 const AudioHardwareConfig& audio_hardware_config_;
39 41
40 DISALLOW_COPY_AND_ASSIGN(DefaultRendererFactory); 42 DISALLOW_COPY_AND_ASSIGN(DefaultRendererFactory);
41 }; 43 };
42 44
43 } // namespace media 45 } // namespace media
44 46
45 #endif // MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_ 47 #endif // MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_
OLDNEW
« no previous file with comments | « media/mojo/services/renderer_config_default.cc ('k') | media/renderers/default_renderer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698