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 5c61111e24f3b2077597a03a986b58c1b89db948..6b4d9d8c0b6ab7c1e4aeade0d232321e0d1cd20f 100644 |
--- a/media/gpu/ipc/service/gpu_video_encode_accelerator.cc |
+++ b/media/gpu/ipc/service/gpu_video_encode_accelerator.cc |
@@ -22,6 +22,7 @@ |
#include "media/base/video_frame.h" |
#include "media/gpu/gpu_video_accelerator_util.h" |
#include "media/gpu/ipc/common/media_messages.h" |
+#include "media/media_features.h" |
#if defined(OS_CHROMEOS) |
#if defined(USE_V4L2_CODEC) |
@@ -30,7 +31,7 @@ |
#if defined(ARCH_CPU_X86_FAMILY) |
#include "media/gpu/vaapi_video_encode_accelerator.h" |
#endif |
-#elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC) |
+#elif defined(OS_ANDROID) && BUILDFLAG(ENABLE_WEBRTC) |
#include "media/gpu/android_video_encode_accelerator.h" |
#elif defined(OS_MACOSX) |
#include "media/gpu/vt_video_encode_accelerator_mac.h" |
@@ -80,7 +81,7 @@ std::unique_ptr<VideoEncodeAccelerator> CreateVaapiVEA() { |
} |
#endif |
-#if defined(OS_ANDROID) && defined(ENABLE_WEBRTC) |
+#if defined(OS_ANDROID) && BUILDFLAG(ENABLE_WEBRTC) |
std::unique_ptr<VideoEncodeAccelerator> CreateAndroidVEA() { |
return base::WrapUnique<VideoEncodeAccelerator>( |
new AndroidVideoEncodeAccelerator()); |
@@ -359,7 +360,7 @@ GpuVideoEncodeAccelerator::GetVEAFactoryFunctions( |
if (!gpu_preferences.disable_vaapi_accelerated_video_encode) |
vea_factory_functions.push_back(base::Bind(&CreateVaapiVEA)); |
#endif |
-#if defined(OS_ANDROID) && defined(ENABLE_WEBRTC) |
+#if defined(OS_ANDROID) && BUILDFLAG(ENABLE_WEBRTC) |
if (!gpu_preferences.disable_web_rtc_hw_encoding) |
vea_factory_functions.push_back(base::Bind(&CreateAndroidVEA)); |
#endif |