Request a GpuVideoAcceleratorFactories when constructing decoders.

media/renderers/default_renderer_factory.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_
 #define MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "media/base/media_export.h"
 #include "media/base/renderer_factory.h"
 
 namespace media {
 
 class AudioDecoder;
 class AudioHardwareConfig;
 class AudioRendererSink;
 class DecoderFactory;
 class GpuVideoAcceleratorFactories;
 class MediaLog;
 class VideoDecoder;
 class VideoRendererSink;
 
 // The default factory class for creating RendererImpl.
 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory {
  public:
-  DefaultRendererFactory(const scoped_refptr<MediaLog>& media_log,
-                         DecoderFactory* decoder_factory,
-                         GpuVideoAcceleratorFactories* gpu_factories,
-                         const AudioHardwareConfig& audio_hardware_config);
+  DefaultRendererFactory(
+      const scoped_refptr<MediaLog>& media_log,
+      DecoderFactory* decoder_factory,
+      base::Callback<GpuVideoAcceleratorFactories*()> get_gpu_factories_cb,

[DaleCurtis, 2016/03/11 23:46:20]

const&?

[sandersd (OOO until July 31), 2016/03/11 23:56:22]

Done.

+      const AudioHardwareConfig& audio_hardware_config);
   ~DefaultRendererFactory() final;
 
   scoped_ptr<Renderer> CreateRenderer(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
       const scoped_refptr<base::TaskRunner>& worker_task_runner,
       AudioRendererSink* audio_renderer_sink,
       VideoRendererSink* video_renderer_sink,
       const RequestSurfaceCB& request_surface_cb) final;
 
  private:
   ScopedVector<AudioDecoder> CreateAudioDecoders(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner);
   ScopedVector<VideoDecoder> CreateVideoDecoders(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
-      const RequestSurfaceCB& request_surface_cb);
+      const RequestSurfaceCB& request_surface_cb,
+      GpuVideoAcceleratorFactories* gpu_factories);
 
   scoped_refptr<MediaLog> media_log_;
 
   // Factory to create extra audio and video decoders.
   // Could be nullptr if not extra decoders are available.
   DecoderFactory* decoder_factory_;
 
   // Factories for supporting video accelerators. May be null.
-  GpuVideoAcceleratorFactories* gpu_factories_;
+  base::Callback<GpuVideoAcceleratorFactories*()> get_gpu_factories_cb_;

[DaleCurtis, 2016/03/11 23:46:20]

Create typedef/using entry for the callback type.

[sandersd (OOO until July 31), 2016/03/11 23:56:22]

Done.

 
   const AudioHardwareConfig& audio_hardware_config_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultRendererFactory);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_DEFAULT_RENDERER_FACTORY_H_