1*4882a593SmuzhiyunFrom 1c029e2924c50d221808bb0a10bba4b36f096c25 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Mon, 28 Sep 2020 20:02:00 +0800 4*4882a593SmuzhiyunSubject: [PATCH 10/14] media: gpu: v4l2: Fix compile error when ozone not 5*4882a593Smuzhiyun enabled 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun chromium/media/gpu/v4l2/BUILD.gn | 5 ++++- 10*4882a593Smuzhiyun chromium/media/gpu/v4l2/generic_v4l2_device.cc | 7 +++++++ 11*4882a593Smuzhiyun 2 files changed, 11 insertions(+), 1 deletion(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/chromium/media/gpu/v4l2/BUILD.gn b/chromium/media/gpu/v4l2/BUILD.gn 14*4882a593Smuzhiyunindex 9cf40f5c5..f5b0650b0 100644 15*4882a593Smuzhiyun--- a/chromium/media/gpu/v4l2/BUILD.gn 16*4882a593Smuzhiyun+++ b/chromium/media/gpu/v4l2/BUILD.gn 17*4882a593Smuzhiyun@@ -106,9 +106,12 @@ source_set("v4l2") { 18*4882a593Smuzhiyun "//media/parsers", 19*4882a593Smuzhiyun "//third_party/libyuv", 20*4882a593Smuzhiyun "//ui/gfx/geometry", 21*4882a593Smuzhiyun- "//ui/ozone", 22*4882a593Smuzhiyun ] 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun+ if (use_ozone) { 25*4882a593Smuzhiyun+ deps += [ "//ui/ozone" ] 26*4882a593Smuzhiyun+ } 27*4882a593Smuzhiyun+ 28*4882a593Smuzhiyun if (use_v4lplugin) { 29*4882a593Smuzhiyun deps += [ ":libv4l2_stubs" ] 30*4882a593Smuzhiyun } 31*4882a593Smuzhiyundiff --git a/chromium/media/gpu/v4l2/generic_v4l2_device.cc b/chromium/media/gpu/v4l2/generic_v4l2_device.cc 32*4882a593Smuzhiyunindex b0e6757f7..adddf7e03 100644 33*4882a593Smuzhiyun--- a/chromium/media/gpu/v4l2/generic_v4l2_device.cc 34*4882a593Smuzhiyun+++ b/chromium/media/gpu/v4l2/generic_v4l2_device.cc 35*4882a593Smuzhiyun@@ -34,8 +34,11 @@ 36*4882a593Smuzhiyun #include "ui/gl/egl_util.h" 37*4882a593Smuzhiyun #include "ui/gl/gl_bindings.h" 38*4882a593Smuzhiyun #include "ui/gl/gl_image_native_pixmap.h" 39*4882a593Smuzhiyun+ 40*4882a593Smuzhiyun+#if defined(USE_OZONE) 41*4882a593Smuzhiyun #include "ui/ozone/public/ozone_platform.h" 42*4882a593Smuzhiyun #include "ui/ozone/public/surface_factory_ozone.h" 43*4882a593Smuzhiyun+#endif 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun #if BUILDFLAG(USE_LIBV4L2) 46*4882a593Smuzhiyun // Auto-generated for dlopen libv4l2 libraries 47*4882a593Smuzhiyun@@ -277,6 +280,9 @@ scoped_refptr<gl::GLImage> GenericV4L2Device::CreateGLImage( 48*4882a593Smuzhiyun const gfx::Size& size, 49*4882a593Smuzhiyun const Fourcc fourcc, 50*4882a593Smuzhiyun gfx::NativePixmapHandle handle) const { 51*4882a593Smuzhiyun+#if !defined(USE_OZONE) 52*4882a593Smuzhiyun+ return nullptr; 53*4882a593Smuzhiyun+#else 54*4882a593Smuzhiyun DVLOGF(3); 55*4882a593Smuzhiyun DCHECK(CanCreateEGLImageFrom(fourcc)); 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun@@ -311,6 +317,7 @@ scoped_refptr<gl::GLImage> GenericV4L2Device::CreateGLImage( 58*4882a593Smuzhiyun bool ret = image->Initialize(std::move(pixmap)); 59*4882a593Smuzhiyun DCHECK(ret); 60*4882a593Smuzhiyun return image; 61*4882a593Smuzhiyun+#endif 62*4882a593Smuzhiyun } 63*4882a593Smuzhiyun 64*4882a593Smuzhiyun EGLBoolean GenericV4L2Device::DestroyEGLImage(EGLDisplay egl_display, 65*4882a593Smuzhiyun-- 66*4882a593Smuzhiyun2.20.1 67*4882a593Smuzhiyun 68