| Index: media/gpu/dxva_video_decode_accelerator_win.cc
|
| diff --git a/media/gpu/dxva_video_decode_accelerator_win.cc b/media/gpu/dxva_video_decode_accelerator_win.cc
|
| index fc58a29094e517fdff6a24226459c38f6fb5a8f3..99b5951c01361c96bdca8b91729dfcf3ee92e0cd 100644
|
| --- a/media/gpu/dxva_video_decode_accelerator_win.cc
|
| +++ b/media/gpu/dxva_video_decode_accelerator_win.cc
|
| @@ -1065,13 +1065,19 @@ GLenum DXVAVideoDecodeAccelerator::GetSurfaceInternalFormat() const {
|
|
|
| // static
|
| VideoDecodeAccelerator::SupportedProfiles
|
| -DXVAVideoDecodeAccelerator::GetSupportedProfiles() {
|
| +DXVAVideoDecodeAccelerator::GetSupportedProfiles(
|
| + const gpu::GpuPreferences& preferences) {
|
| TRACE_EVENT0("gpu,startup",
|
| "DXVAVideoDecodeAccelerator::GetSupportedProfiles");
|
|
|
| // TODO(henryhsu): Need to ensure the profiles are actually supported.
|
| SupportedProfiles profiles;
|
| for (const auto& supported_profile : kSupportedProfiles) {
|
| + if (!preferences.enable_accelerated_vpx_decode &&
|
| + (supported_profile >= VP8PROFILE_MIN) &&
|
| + (supported_profile <= VP9PROFILE_MAX)) {
|
| + continue;
|
| + }
|
| std::pair<int, int> min_resolution = GetMinResolution(supported_profile);
|
| std::pair<int, int> max_resolution = GetMaxResolution(supported_profile);
|
|
|
|
|