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

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

Issue 2871503002: Remove ScopedVector from audio/video renderer related code in media/ (Closed)
Patch Set: Address xhwang's comments and delete some useless includes Created 3 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 #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 <memory> 8 #include <memory>
9 #include <vector>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_vector.h"
13 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
14 #include "media/base/renderer_factory.h" 14 #include "media/base/renderer_factory.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 class AudioDecoder; 18 class AudioDecoder;
19 class AudioRendererSink; 19 class AudioRendererSink;
20 class DecoderFactory; 20 class DecoderFactory;
21 class GpuVideoAcceleratorFactories; 21 class GpuVideoAcceleratorFactories;
22 class MediaLog; 22 class MediaLog;
23 class VideoDecoder; 23 class VideoDecoder;
24 class VideoRendererSink; 24 class VideoRendererSink;
25 25
26 using CreateAudioDecodersCB = 26 using CreateAudioDecodersCB =
27 base::RepeatingCallback<ScopedVector<AudioDecoder>()>; 27 base::RepeatingCallback<std::vector<std::unique_ptr<AudioDecoder>>()>;
28 using CreateVideoDecodersCB = 28 using CreateVideoDecodersCB =
29 base::RepeatingCallback<ScopedVector<VideoDecoder>()>; 29 base::RepeatingCallback<std::vector<std::unique_ptr<VideoDecoder>>()>;
30 30
31 // The default factory class for creating RendererImpl. 31 // The default factory class for creating RendererImpl.
32 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory { 32 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory {
33 public: 33 public:
34 using GetGpuFactoriesCB = base::Callback<GpuVideoAcceleratorFactories*()>; 34 using GetGpuFactoriesCB = base::Callback<GpuVideoAcceleratorFactories*()>;
35 35
36 DefaultRendererFactory(MediaLog* media_log, 36 DefaultRendererFactory(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 ~DefaultRendererFactory() final; 39 ~DefaultRendererFactory() final;
40 40
41 std::unique_ptr<Renderer> CreateRenderer( 41 std::unique_ptr<Renderer> CreateRenderer(
42 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 42 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
43 const scoped_refptr<base::TaskRunner>& worker_task_runner, 43 const scoped_refptr<base::TaskRunner>& worker_task_runner,
44 AudioRendererSink* audio_renderer_sink, 44 AudioRendererSink* audio_renderer_sink,
45 VideoRendererSink* video_renderer_sink, 45 VideoRendererSink* video_renderer_sink,
46 const RequestSurfaceCB& request_surface_cb) final; 46 const RequestSurfaceCB& request_surface_cb) final;
47 47
48 private: 48 private:
49 ScopedVector<AudioDecoder> CreateAudioDecoders( 49 std::vector<std::unique_ptr<AudioDecoder>> CreateAudioDecoders(
50 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner); 50 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner);
51 ScopedVector<VideoDecoder> CreateVideoDecoders( 51 std::vector<std::unique_ptr<VideoDecoder>> CreateVideoDecoders(
52 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 52 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
53 const RequestSurfaceCB& request_surface_cb, 53 const RequestSurfaceCB& request_surface_cb,
54 GpuVideoAcceleratorFactories* gpu_factories); 54 GpuVideoAcceleratorFactories* gpu_factories);
55 55
56 MediaLog* media_log_; 56 MediaLog* media_log_;
57 57
58 // Factory to create extra audio and video decoders. 58 // Factory to create extra audio and video decoders.
59 // Could be nullptr if not extra decoders are available. 59 // Could be nullptr if not extra decoders are available.
60 DecoderFactory* decoder_factory_; 60 DecoderFactory* decoder_factory_;
61 61
62 // Creates factories for supporting video accelerators. May be null. 62 // Creates factories for supporting video accelerators. May be null.
63 GetGpuFactoriesCB get_gpu_factories_cb_; 63 GetGpuFactoriesCB get_gpu_factories_cb_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(DefaultRendererFactory); 65 DISALLOW_COPY_AND_ASSIGN(DefaultRendererFactory);
66 }; 66 };
67 67
68 } // namespace media 68 } // namespace media
69 69
70 #endif // MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_ 70 #endif // MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_
OLDNEW
« no previous file with comments | « media/renderers/audio_renderer_impl_unittest.cc ('k') | media/renderers/default_renderer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698