media/.../{android_,gpu_}video_encode_accelerator{,_host} cleanup

media/gpu/ipc/service/gpu_video_encode_accelerator.h

 // Copyright 2013 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_GPU_IPC_SERVICE_GPU_VIDEO_ENCODE_ACCELERATOR_H_
 #define MEDIA_GPU_IPC_SERVICE_GPU_VIDEO_ENCODE_ACCELERATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 56 matching lines @@
   // gpu::GpuCommandBufferStub::DestructionObserver implementation.
   void OnWillDestroyStub() override;
 
   // Static query for supported profiles.  This query calls the appropriate
   // platform-specific version. The returned supported profiles vector will
   // not contain duplicates.
   static gpu::VideoEncodeAcceleratorSupportedProfiles GetSupportedProfiles(
       const gpu::GpuPreferences& gpu_preferences);
 
  private:
-  typedef std::unique_ptr<VideoEncodeAccelerator> (*CreateVEAFp)();
-
-  // Return a set of VEA Create function pointers applicable to the current
-  // platform.
-  static std::vector<CreateVEAFp> CreateVEAFps(
+  // Return a vector of of VEA actory methods for the current platform.
+  using VEAFactoryMethod =
+      base::Callback<std::unique_ptr<VideoEncodeAccelerator>()>;
+  static std::vector<VEAFactoryMethod> GetVEAFactoryMethods(

[watk, 2016/08/18 18:12:15]

nit: calling these methods is slightly misleading IMO, since you're binding
nonmember functions. I'd just s/method/function.

[mcasas, 2016/08/18 19:24:40]

Done.

       const gpu::GpuPreferences& gpu_preferences);
-#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
-  static std::unique_ptr<VideoEncodeAccelerator> CreateV4L2VEA();
-#endif
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-  static std::unique_ptr<VideoEncodeAccelerator> CreateVaapiVEA();
-#endif
-#if defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
-  static std::unique_ptr<VideoEncodeAccelerator> CreateAndroidVEA();
-#endif
-#if defined(OS_MACOSX)
-  static std::unique_ptr<VideoEncodeAccelerator> CreateVTVEA();
-#endif
-#if defined(OS_WIN)
-  static std::unique_ptr<media::VideoEncodeAccelerator>
-  CreateMediaFoundationVEA();
-#endif
 
   // IPC handlers, proxying VideoEncodeAccelerator for the renderer
   // process.
   void OnEncode(const AcceleratedVideoEncoderMsg_Encode_Params& params);
   void OnEncode2(const AcceleratedVideoEncoderMsg_Encode_Params2& params);
   void OnUseOutputBitstreamBuffer(int32_t buffer_id,
                                   base::SharedMemoryHandle buffer_handle,
                                   uint32_t buffer_size);
   void OnRequestEncodingParametersChange(uint32_t bitrate, uint32_t framerate);
 
@@ skipping 23 matching lines @@
 
   // Weak pointer for VideoFrames that refer back to |this|.
   base::WeakPtrFactory<GpuVideoEncodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoEncodeAccelerator);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_IPC_SERVICE_GPU_VIDEO_ENCODE_ACCELERATOR_H_