| 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 bad0c4634b3be3b1bad9d37fb609aa1c4be79e08..ca60f6f1c8dcac639a5424a3bc66867e3acf4666 100644
|
| --- a/content/common/gpu/media/gpu_video_encode_accelerator.h
|
| +++ b/content/common/gpu/media/gpu_video_encode_accelerator.h
|
| @@ -60,20 +60,14 @@
|
| // 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:
|
| - typedef scoped_ptr<media::VideoEncodeAccelerator>(*CreateVEAFp)();
|
| -
|
| - // Return a set of VEA Create function pointers applicable to the current
|
| - // platform.
|
| - static std::vector<CreateVEAFp> CreateVEAFps();
|
| - static scoped_ptr<media::VideoEncodeAccelerator> CreateV4L2VEA();
|
| - static scoped_ptr<media::VideoEncodeAccelerator> CreateVaapiVEA();
|
| - static scoped_ptr<media::VideoEncodeAccelerator> CreateAndroidVEA();
|
| + // Create the appropriate platform-specific VEA.
|
| + static scoped_ptr<media::VideoEncodeAccelerator> CreateEncoder();
|
|
|
| // IPC handlers, proxying media::VideoEncodeAccelerator for the renderer
|
| // process.
|
|
|