From 1c029e2924c50d221808bb0a10bba4b36f096c25 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Mon, 28 Sep 2020 20:02:00 +0800 Subject: [PATCH 10/14] media: gpu: v4l2: Fix compile error when ozone not enabled Signed-off-by: Jeffy Chen --- chromium/media/gpu/v4l2/BUILD.gn | 5 ++++- chromium/media/gpu/v4l2/generic_v4l2_device.cc | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/chromium/media/gpu/v4l2/BUILD.gn b/chromium/media/gpu/v4l2/BUILD.gn index 9cf40f5c5..f5b0650b0 100644 --- a/chromium/media/gpu/v4l2/BUILD.gn +++ b/chromium/media/gpu/v4l2/BUILD.gn @@ -106,9 +106,12 @@ source_set("v4l2") { "//media/parsers", "//third_party/libyuv", "//ui/gfx/geometry", - "//ui/ozone", ] + if (use_ozone) { + deps += [ "//ui/ozone" ] + } + if (use_v4lplugin) { deps += [ ":libv4l2_stubs" ] } diff --git a/chromium/media/gpu/v4l2/generic_v4l2_device.cc b/chromium/media/gpu/v4l2/generic_v4l2_device.cc index b0e6757f7..adddf7e03 100644 --- a/chromium/media/gpu/v4l2/generic_v4l2_device.cc +++ b/chromium/media/gpu/v4l2/generic_v4l2_device.cc @@ -34,8 +34,11 @@ #include "ui/gl/egl_util.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_image_native_pixmap.h" + +#if defined(USE_OZONE) #include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/surface_factory_ozone.h" +#endif #if BUILDFLAG(USE_LIBV4L2) // Auto-generated for dlopen libv4l2 libraries @@ -277,6 +280,9 @@ scoped_refptr GenericV4L2Device::CreateGLImage( const gfx::Size& size, const Fourcc fourcc, gfx::NativePixmapHandle handle) const { +#if !defined(USE_OZONE) + return nullptr; +#else DVLOGF(3); DCHECK(CanCreateEGLImageFrom(fourcc)); @@ -311,6 +317,7 @@ scoped_refptr GenericV4L2Device::CreateGLImage( bool ret = image->Initialize(std::move(pixmap)); DCHECK(ret); return image; +#endif } EGLBoolean GenericV4L2Device::DestroyEGLImage(EGLDisplay egl_display, -- 2.20.1