From 448716d8f75185795d9b01164440d0753850a80a Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Fri, 25 Oct 2019 13:05:16 +0200
Subject: libcamera: Switch PixelFormat to DRM FourCC values

Use DRM FourCC values for the newly defined PixelFormat.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/pipeline/ipu3/ipu3.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/libcamera/pipeline/ipu3/ipu3.cpp')

diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 8d3ad568..1c5fccf6 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -10,6 +10,7 @@
 #include <memory>
 #include <vector>
 
+#include <linux/drm_fourcc.h>
 #include <linux/media-bus-format.h>
 
 #include <libcamera/camera.h>
@@ -249,7 +250,7 @@ IPU3CameraConfiguration::IPU3CameraConfiguration(Camera *camera,
 void IPU3CameraConfiguration::adjustStream(StreamConfiguration &cfg, bool scale)
 {
 	/* The only pixel format the driver supports is NV12. */
-	cfg.pixelFormat = V4L2_PIX_FMT_NV12;
+	cfg.pixelFormat = DRM_FORMAT_NV12;
 
 	if (scale) {
 		/*
@@ -404,7 +405,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,
 		StreamConfiguration cfg = {};
 		IPU3Stream *stream = nullptr;
 
-		cfg.pixelFormat = V4L2_PIX_FMT_NV12;
+		cfg.pixelFormat = DRM_FORMAT_NV12;
 
 		switch (role) {
 		case StreamRole::StillCapture:
@@ -1121,7 +1122,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,
 		return 0;
 
 	V4L2DeviceFormat outputFormat = {};
-	outputFormat.fourcc = V4L2_PIX_FMT_NV12;
+	outputFormat.fourcc = dev->toV4L2Fourcc(DRM_FORMAT_NV12);
 	outputFormat.size = cfg.size;
 	outputFormat.planesCount = 2;
 
-- 
cgit v1.2.1