From patchwork Wed Mar 18 03:31:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 3155 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E6C3E6041A for ; Wed, 18 Mar 2020 04:32:36 +0100 (CET) X-Halon-ID: 1c3f677a-68c9-11ea-9f85-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de [79.202.35.146]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 1c3f677a-68c9-11ea-9f85-005056917a89; Wed, 18 Mar 2020 04:32:36 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 18 Mar 2020 04:31:54 +0100 Message-Id: <20200318033200.3042855-3-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200318033200.3042855-1-niklas.soderlund@ragnatech.se> References: <20200318033200.3042855-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/8] libcamera: pixelformats: include linux/drm_fourcc.h X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2020 03:32:37 -0000 Instead of having to include linux/drm_fourcc.h everywhere a DRM FourCC are used in conjunction with PixelFormat include the header directly in pixelformats.h. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Reviewed-by: Laurent Pinchart --- include/libcamera/pixelformats.h | 2 ++ src/libcamera/pipeline/ipu3/ipu3.cpp | 1 - src/libcamera/pipeline/rkisp1/rkisp1.cpp | 1 - src/libcamera/pipeline/vimc.cpp | 1 - src/libcamera/v4l2_videodevice.cpp | 1 - src/qcam/format_converter.cpp | 2 -- src/v4l2/v4l2_camera_proxy.cpp | 1 - 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h index 6e25b8d8b76e5961..544363af7a8c6f05 100644 --- a/include/libcamera/pixelformats.h +++ b/include/libcamera/pixelformats.h @@ -9,6 +9,8 @@ #include +#include + namespace libcamera { using PixelFormat = uint32_t; diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 0c2a217c9ea8f6ba..1e3d8a107c6475be 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index dec0ad6118241ff1..a95ae48ac8cfbc98 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index a30e416e6000bcda..de2458afff3a4784 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 858310c3b810350a..3869766046236f34 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index d4a66f381f5a1b78..7b8ad77c42fe85d4 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -7,8 +7,6 @@ #include -#include - #include #include "format_converter.h" diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index b620f236499cf77d..e349fbddc2a4d5a2 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include