Chromium Code Reviews| Index: media/gpu/ipc/service/gpu_video_encode_accelerator.cc |
| diff --git a/media/gpu/ipc/service/gpu_video_encode_accelerator.cc b/media/gpu/ipc/service/gpu_video_encode_accelerator.cc |
| index dc4e51591bd843e8e2d8486bf12f5d967bf21046..f5be7729a88b8dbf8facd858a8b0634dfc5f1b5b 100644 |
| --- a/media/gpu/ipc/service/gpu_video_encode_accelerator.cc |
| +++ b/media/gpu/ipc/service/gpu_video_encode_accelerator.cc |
| @@ -25,7 +25,7 @@ |
| #include "media/gpu/ipc/common/media_messages.h" |
| #if defined(OS_CHROMEOS) |
| -#if defined(USE_V4L2_CODEC) |
| +#if defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC)) |
| #include "media/gpu/v4l2_video_encode_accelerator.h" |
| #endif |
| #if defined(ARCH_CPU_X86_FAMILY) |
| @@ -194,7 +194,9 @@ std::vector<GpuVideoEncodeAccelerator::CreateVEAFp> |
| GpuVideoEncodeAccelerator::CreateVEAFps( |
| const gpu::GpuPreferences& gpu_preferences) { |
| std::vector<GpuVideoEncodeAccelerator::CreateVEAFp> create_vea_fps; |
| -#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) |
| + |
| +#if defined(OS_CHROMEOS) && (defined(ARCH_CPU_ARMEL) || \ |
| + (defined(USE_OZONE) && defined(USE_V4L2_CODEC))) |
|
wuchengli
2016/07/12 11:39:51
This is not directly related to gn change. Please
|
| create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateV4L2VEA); |
| #endif |
| #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
| @@ -211,7 +213,8 @@ GpuVideoEncodeAccelerator::CreateVEAFps( |
| return create_vea_fps; |
| } |
| -#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) |
| +#if defined(OS_CHROMEOS) && (defined(ARCH_CPU_ARMEL) || \ |
| + (defined(USE_OZONE) && defined(USE_V4L2_CODEC))) |
| // static |
| std::unique_ptr<VideoEncodeAccelerator> |
| GpuVideoEncodeAccelerator::CreateV4L2VEA() { |