diff options
Diffstat (limited to 'chromium/media/gpu/gpu_video_decode_accelerator_factory.cc')
| -rw-r--r-- | chromium/media/gpu/gpu_video_decode_accelerator_factory.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chromium/media/gpu/gpu_video_decode_accelerator_factory.cc b/chromium/media/gpu/gpu_video_decode_accelerator_factory.cc index 37cf3a0e089..7f4e0eb6ed8 100644 --- a/chromium/media/gpu/gpu_video_decode_accelerator_factory.cc +++ b/chromium/media/gpu/gpu_video_decode_accelerator_factory.cc @@ -142,13 +142,17 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA( #if defined(OS_WIN) &GpuVideoDecodeAcceleratorFactory::CreateDXVAVDA, #endif -#if BUILDFLAG(USE_VAAPI) - &GpuVideoDecodeAcceleratorFactory::CreateVaapiVDA, -#endif + // Usually only one of USE_VAAPI or USE_V4L2_CODEC is defined on ChromeOS, + // except for Chromeboxes with companion video acceleration chips, which have + // both. In those cases prefer the V4L2 creation function. #if BUILDFLAG(USE_V4L2_CODEC) &GpuVideoDecodeAcceleratorFactory::CreateV4L2VDA, &GpuVideoDecodeAcceleratorFactory::CreateV4L2SVDA, #endif +#if BUILDFLAG(USE_VAAPI) + &GpuVideoDecodeAcceleratorFactory::CreateVaapiVDA, +#endif + #if defined(OS_MAC) &GpuVideoDecodeAcceleratorFactory::CreateVTVDA, #endif |