Support multiple video decoders and encoders

content/common/gpu/media/gpu_video_encode_accelerator.h

Index: content/common/gpu/media/gpu_video_encode_accelerator.h
diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.h b/content/common/gpu/media/gpu_video_encode_accelerator.h
index ca60f6f1c8dcac639a5424a3bc66867e3acf4666..dba5a10cc17475b41ff14a3a5a0764f56f8f86cd 100644
--- a/content/common/gpu/media/gpu_video_encode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_encode_accelerator.h
@@ -31,6 +31,9 @@ class GpuVideoEncodeAccelerator
       public media::VideoEncodeAccelerator::Client,
       public GpuCommandBufferStub::DestructionObserver {
  public:
+  typedef base::Callback<scoped_ptr<media::VideoEncodeAccelerator>(void)>

[Pawel Osciak, 2014/12/31 07:56:00]

private please.

[henryhsu, 2014/12/31 08:47:53]

Done.

+      CreateVEACb;
+
   GpuVideoEncodeAccelerator(int32 host_route_id, GpuCommandBufferStub* stub);
   ~GpuVideoEncodeAccelerator() override;
 
@@ -60,14 +63,20 @@ class GpuVideoEncodeAccelerator
   // Static query for supported profiles.  This query calls the appropriate
   // platform-specific version.
   static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-  GetSupportedProfiles();
+      GetSupportedProfiles();
   static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-  ConvertMediaToGpuProfiles(const std::vector<
-      media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);
+      ConvertMediaToGpuProfiles(const std::vector<
+          media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);
 
  private:
-  // Create the appropriate platform-specific VEA.
-  static scoped_ptr<media::VideoEncodeAccelerator> CreateEncoder();
+  // Create the appropriate platform-specific VEA callback functions.

[Pawel Osciak, 2014/12/31 07:56:00]

Same comments as in gvda.h please.

[henryhsu, 2014/12/31 08:47:53]

Done.

+  static std::vector<CreateVEACb> CreateEncoderCbs();
+  // Create V4L2 VEA.
+  static scoped_ptr<media::VideoEncodeAccelerator> CreateV4L2Encoder();
+  // Create vaapi VEA on x86 CrOS.
+  static scoped_ptr<media::VideoEncodeAccelerator> CreateVaapiEncoder();
+  // Create Android VEA.
+  static scoped_ptr<media::VideoEncodeAccelerator> CreateAndroidEncoder();
 
   // IPC handlers, proxying media::VideoEncodeAccelerator for the renderer
   // process.