| 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 6f37abb2502a5279776678eefb70d2a73e74df9b..ca60f6f1c8dcac639a5424a3bc66867e3acf4666 100644
|
| --- a/content/common/gpu/media/gpu_video_encode_accelerator.h
|
| +++ b/content/common/gpu/media/gpu_video_encode_accelerator.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/common/gpu/gpu_command_buffer_stub.h"
|
| +#include "gpu/config/gpu_info.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "media/video/video_encode_accelerator.h"
|
| #include "ui/gfx/size.h"
|
| @@ -58,8 +59,11 @@ class GpuVideoEncodeAccelerator
|
|
|
| // Static query for supported profiles. This query calls the appropriate
|
| // platform-specific version.
|
| - static std::vector<media::VideoEncodeAccelerator::SupportedProfile>
|
| - GetSupportedProfiles();
|
| + static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
|
| + GetSupportedProfiles();
|
| + static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
|
| + ConvertMediaToGpuProfiles(const std::vector<
|
| + media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);
|
|
|
| private:
|
| // Create the appropriate platform-specific VEA.
|
|
|