From patchwork Sun Oct 27 23:43:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 2247 Return-Path: Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BD8466151F for ; Mon, 28 Oct 2019 00:41:29 +0100 (CET) X-Originating-IP: 93.2.121.143 Received: from uno.localdomain (143.121.2.93.rev.sfr.net [93.2.121.143]) (Authenticated sender: jacopo@jmondi.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 5BC9B20004; Sun, 27 Oct 2019 23:41:29 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 28 Oct 2019 00:43:11 +0100 Message-Id: <20191027234312.35284-10-jacopo@jmondi.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027234312.35284-1-jacopo@jmondi.org> References: <20191027234312.35284-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 09/10] qcam: Convert to use DRM formats 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: Sun, 27 Oct 2019 23:41:30 -0000 Use DRM_FORMAT_* fourcc codes in place of the V4L2_PIX_FMT_* ones in the qcam format conversion routine. Signed-off-by: Jacopo Mondi --- src/qcam/format_converter.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index 86b03b2cd84d..383d48223140 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include @@ -31,84 +31,84 @@ int FormatConverter::configure(unsigned int format, unsigned int width, unsigned int height) { switch (format) { - case V4L2_PIX_FMT_NV12: + case DRM_FORMAT_NV12: formatFamily_ = NV; horzSubSample_ = 2; vertSubSample_ = 2; nvSwap_ = false; break; - case V4L2_PIX_FMT_NV21: + case DRM_FORMAT_NV21: formatFamily_ = NV; horzSubSample_ = 2; vertSubSample_ = 2; nvSwap_ = true; break; - case V4L2_PIX_FMT_NV16: + case DRM_FORMAT_NV16: formatFamily_ = NV; horzSubSample_ = 2; vertSubSample_ = 1; nvSwap_ = false; break; - case V4L2_PIX_FMT_NV61: + case DRM_FORMAT_NV61: formatFamily_ = NV; horzSubSample_ = 2; vertSubSample_ = 1; nvSwap_ = true; break; - case V4L2_PIX_FMT_NV24: + case DRM_FORMAT_NV24: formatFamily_ = NV; horzSubSample_ = 1; vertSubSample_ = 1; nvSwap_ = false; break; - case V4L2_PIX_FMT_NV42: + case DRM_FORMAT_NV42: formatFamily_ = NV; horzSubSample_ = 1; vertSubSample_ = 1; nvSwap_ = true; break; - case V4L2_PIX_FMT_BGR24: + case DRM_FORMAT_RGB888: formatFamily_ = RGB; r_pos_ = 2; g_pos_ = 1; b_pos_ = 0; bpp_ = 3; break; - case V4L2_PIX_FMT_RGB24: + case DRM_FORMAT_BGR888: formatFamily_ = RGB; r_pos_ = 0; g_pos_ = 1; b_pos_ = 2; bpp_ = 3; break; - case V4L2_PIX_FMT_ARGB32: + case DRM_FORMAT_BGRA8888: formatFamily_ = RGB; r_pos_ = 1; g_pos_ = 2; b_pos_ = 3; bpp_ = 4; break; - case V4L2_PIX_FMT_VYUY: + case DRM_FORMAT_VYUY: formatFamily_ = YUV; y_pos_ = 1; cb_pos_ = 2; break; - case V4L2_PIX_FMT_YVYU: + case DRM_FORMAT_YVYU: formatFamily_ = YUV; y_pos_ = 0; cb_pos_ = 3; break; - case V4L2_PIX_FMT_UYVY: + case DRM_FORMAT_UYVY: formatFamily_ = YUV; y_pos_ = 1; cb_pos_ = 0; break; - case V4L2_PIX_FMT_YUYV: + case DRM_FORMAT_YUYV: formatFamily_ = YUV; y_pos_ = 0; cb_pos_ = 1; break; - case V4L2_PIX_FMT_MJPEG: + case DRM_FORMAT_MJPEG: formatFamily_ = MJPEG; break; default: