| Index: gpu/config/gpu_info.h
|
| diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h
|
| index d6f61fd60f79e027655477675c041937c3919cd0..cef5ae2a674bf345b924cc8f1da6845ff6315084 100644
|
| --- a/gpu/config/gpu_info.h
|
| +++ b/gpu/config/gpu_info.h
|
| @@ -60,9 +60,17 @@ struct GPU_EXPORT VideoDecodeAcceleratorSupportedProfile {
|
| gfx::Size max_resolution;
|
| gfx::Size min_resolution;
|
| };
|
| +
|
| using VideoDecodeAcceleratorSupportedProfiles =
|
| std::vector<VideoDecodeAcceleratorSupportedProfile>;
|
|
|
| +struct GPU_EXPORT VideoDecodeAcceleratorCapabilities {
|
| + VideoDecodeAcceleratorCapabilities();
|
| + ~VideoDecodeAcceleratorCapabilities();
|
| + VideoDecodeAcceleratorSupportedProfiles supported_profiles;
|
| + uint32 flags;
|
| +};
|
| +
|
| // Specification of an encoding profile supported by a hardware encoder.
|
| struct GPU_EXPORT VideoEncodeAcceleratorSupportedProfile {
|
| VideoCodecProfile profile;
|
| @@ -220,8 +228,7 @@ struct GPU_EXPORT GPUInfo {
|
| DxDiagNode dx_diagnostics;
|
| #endif
|
|
|
| - VideoDecodeAcceleratorSupportedProfiles
|
| - video_decode_accelerator_supported_profiles;
|
| + VideoDecodeAcceleratorCapabilities video_decode_accelerator_capabilities;
|
| VideoEncodeAcceleratorSupportedProfiles
|
| video_encode_accelerator_supported_profiles;
|
| bool jpeg_decode_accelerator_supported;
|
|
|