Chromium Code Reviews| Index: content/public/browser/gpu_utils.cc |
| diff --git a/content/public/browser/gpu_utils.cc b/content/public/browser/gpu_utils.cc |
| index 859be2ef08ec11dd03d1ddca25561f7e7ff0387a..ac177d93bbfa754dd7eac017556f8a8570b74b6f 100644 |
| --- a/content/public/browser/gpu_utils.cc |
| +++ b/content/public/browser/gpu_utils.cc |
| @@ -48,11 +48,13 @@ const gpu::GpuPreferences GetGpuPreferencesFromCommandLine() { |
| command_line->HasSwitch(switches::kDisableWebRtcHWEncoding); |
| #endif |
| #if defined(OS_WIN) |
| - gpu_preferences.enable_accelerated_vpx_decode = true; |
| - uint32_t enable_vpx_decode; |
| + uint32_t enable_accelerated_vpx_decode_val = |
|
jbauman
2016/08/22 18:20:49
This needs to be VPX_VENDOR_MICROSOFT.
|
| + gpu::GpuPreferences::VPX_VENDOR_NONE; |
| if (GetUintFromSwitch(command_line, switches::kEnableAcceleratedVpxDecode, |
| - &enable_vpx_decode)) { |
| - gpu_preferences.enable_accelerated_vpx_decode = !!enable_vpx_decode; |
| + &enable_accelerated_vpx_decode_val)) { |
| + gpu_preferences.enable_accelerated_vpx_decode = |
| + static_cast<gpu::GpuPreferences::VpxDecodeVendors>( |
| + enable_accelerated_vpx_decode_val); |
| } |
| gpu_preferences.enable_zero_copy_dxgi_video = |
| !command_line->HasSwitch(switches::kDisableZeroCopyDxgiVideo); |