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

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

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android Created 4 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
« no previous file with comments | « media/cdm/cenc_utils.cc ('k') | media/renderers/default_renderer_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
9
8 #include "base/callback.h" 10 #include "base/callback.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
11 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
12 #include "media/base/renderer_factory.h" 14 #include "media/base/renderer_factory.h"
13 15
14 namespace media { 16 namespace media {
15 17
16 class AudioDecoder; 18 class AudioDecoder;
17 class AudioHardwareConfig; 19 class AudioHardwareConfig;
18 class AudioRendererSink; 20 class AudioRendererSink;
19 class DecoderFactory; 21 class DecoderFactory;
20 class GpuVideoAcceleratorFactories; 22 class GpuVideoAcceleratorFactories;
21 class MediaLog; 23 class MediaLog;
22 class VideoDecoder; 24 class VideoDecoder;
23 class VideoRendererSink; 25 class VideoRendererSink;
24 26
25 // The default factory class for creating RendererImpl. 27 // The default factory class for creating RendererImpl.
26 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory { 28 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory {
27 public: 29 public:
28 using GetGpuFactoriesCB = base::Callback<GpuVideoAcceleratorFactories*()>; 30 using GetGpuFactoriesCB = base::Callback<GpuVideoAcceleratorFactories*()>;
29 31
30 DefaultRendererFactory(const scoped_refptr<MediaLog>& media_log, 32 DefaultRendererFactory(const scoped_refptr<MediaLog>& media_log,
31 DecoderFactory* decoder_factory, 33 DecoderFactory* decoder_factory,
32 const GetGpuFactoriesCB& get_gpu_factories_cb, 34 const GetGpuFactoriesCB& get_gpu_factories_cb,
33 const AudioHardwareConfig& audio_hardware_config); 35 const AudioHardwareConfig& audio_hardware_config);
34 ~DefaultRendererFactory() final; 36 ~DefaultRendererFactory() final;
35 37
36 scoped_ptr<Renderer> CreateRenderer( 38 std::unique_ptr<Renderer> CreateRenderer(
37 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 39 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
38 const scoped_refptr<base::TaskRunner>& worker_task_runner, 40 const scoped_refptr<base::TaskRunner>& worker_task_runner,
39 AudioRendererSink* audio_renderer_sink, 41 AudioRendererSink* audio_renderer_sink,
40 VideoRendererSink* video_renderer_sink, 42 VideoRendererSink* video_renderer_sink,
41 const RequestSurfaceCB& request_surface_cb) final; 43 const RequestSurfaceCB& request_surface_cb) final;
42 44
43 private: 45 private:
44 ScopedVector<AudioDecoder> CreateAudioDecoders( 46 ScopedVector<AudioDecoder> CreateAudioDecoders(
45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner); 47 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner);
46 ScopedVector<VideoDecoder> CreateVideoDecoders( 48 ScopedVector<VideoDecoder> CreateVideoDecoders(
(...skipping 11 matching lines...) Expand all
58 GetGpuFactoriesCB get_gpu_factories_cb_; 60 GetGpuFactoriesCB get_gpu_factories_cb_;
59 61
60 const AudioHardwareConfig& audio_hardware_config_; 62 const AudioHardwareConfig& audio_hardware_config_;
61 63
62 DISALLOW_COPY_AND_ASSIGN(DefaultRendererFactory); 64 DISALLOW_COPY_AND_ASSIGN(DefaultRendererFactory);
63 }; 65 };
64 66
65 } // namespace media 67 } // namespace media
66 68
67 #endif // MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_ 69 #endif // MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_
OLDNEW
« no previous file with comments | « media/cdm/cenc_utils.cc ('k') | media/renderers/default_renderer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698