From eb20c54f24a9f1e5daa2fec8d246963f57c8e781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
Date: Tue, 17 Mar 2020 11:20:46 +0100
Subject: libcamera: pixelformats: include linux/drm_fourcc.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of having to include linux/drm_fourcc.h everywhere a DRM FourCC
is used in conjunction with PixelFormat include the header directly in
pixelformats.h.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 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/qcam/format_converter.cpp            | 2 --
 src/v4l2/v4l2_camera_proxy.cpp           | 1 -
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h
index 6e25b8d8..544363af 100644
--- a/include/libcamera/pixelformats.h
+++ b/include/libcamera/pixelformats.h
@@ -9,6 +9,8 @@
 
 #include <stdint.h>
 
+#include <linux/drm_fourcc.h>
+
 namespace libcamera {
 
 using PixelFormat = uint32_t;
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 33f97b34..84158ebe 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -10,7 +10,6 @@
 #include <memory>
 #include <vector>
 
-#include <linux/drm_fourcc.h>
 #include <linux/media-bus-format.h>
 
 #include <libcamera/camera.h>
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 11e8c494..d1abdb50 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -11,7 +11,6 @@
 #include <memory>
 #include <queue>
 
-#include <linux/drm_fourcc.h>
 #include <linux/media-bus-format.h>
 
 #include <ipa/rkisp1.h>
diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
index 5b846cf5..9817fb93 100644
--- a/src/libcamera/pipeline/vimc.cpp
+++ b/src/libcamera/pipeline/vimc.cpp
@@ -10,7 +10,6 @@
 #include <iomanip>
 #include <tuple>
 
-#include <linux/drm_fourcc.h>
 #include <linux/media-bus-format.h>
 
 #include <ipa/ipa_interface.h>
diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp
index d4a66f38..7b8ad77c 100644
--- a/src/qcam/format_converter.cpp
+++ b/src/qcam/format_converter.cpp
@@ -7,8 +7,6 @@
 
 #include <errno.h>
 
-#include <linux/drm_fourcc.h>
-
 #include <QImage>
 
 #include "format_converter.h"
diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index b620f236..e349fbdd 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -10,7 +10,6 @@
 #include <algorithm>
 #include <array>
 #include <errno.h>
-#include <linux/drm_fourcc.h>
 #include <linux/videodev2.h>
 #include <string.h>
 #include <sys/mman.h>
-- 
cgit v1.2.1