From patchwork Fri Mar 13 23:38:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3091 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5E50962928 for ; Sat, 14 Mar 2020 00:39:09 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 683511900; Sat, 14 Mar 2020 00:39:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584142749; bh=l/COplkD/CSkzA9gCu0JsiviApvV0IrCuUFMZpFmhXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TNUw9aO3lpvd+7+mvHjgH+Zx6us8kzpyMTysKJXVwzJihM7a6/54LyBhW7i/8eYbb WKA7kfhVl9fvTDmk2aTWplTu08CVcuv9cSAuEkq61i4Go8EfpoiUKJ6+CiZG96LKe7 T0PLyPqEmMKxKVZu9s2QrEBU3/hbKHRhut1HsskM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Cc: Martijn Braam , Andrey Konovalov , Mickael GUENE , Benjamin GAIGNARD Date: Sat, 14 Mar 2020 01:38:55 +0200 Message-Id: <20200313233856.25202-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200313233856.25202-1-laurent.pinchart@ideasonboard.com> References: <20200313233856.25202-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 7/8] libcamera: v4l2_videodevice: Map V4L2_PIX_FMT_GREY to DRM FourCC 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: Fri, 13 Mar 2020 23:39:09 -0000 DRM has a format for 8-bit greyscale data, DRM_FORMAT_R8. Despite the 'R' name, which comes from GL/Vulkan to mean single-channel data, the format maps to greyscale for display. We can thus map it to V4L2_PIX_FMT_GREY. Signed-off-by: Laurent Pinchart --- src/libcamera/v4l2_videodevice.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index f68b67b33293..f89bf2ff781e 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1473,12 +1473,15 @@ PixelFormat V4L2VideoDevice::toPixelFormat(uint32_t v4l2Fourcc) case V4L2_PIX_FMT_NV21M: return DRM_FORMAT_NV21; + /* Greyscale formats. */ + case V4L2_PIX_FMT_GREY: + return DRM_FORMAT_R8; + /* Compressed formats. */ case V4L2_PIX_FMT_MJPEG: return DRM_FORMAT_MJPEG; /* V4L2 formats not yet supported by DRM. */ - case V4L2_PIX_FMT_GREY: default: /* * \todo We can't use LOG() in a static method of a Loggable @@ -1557,6 +1560,10 @@ uint32_t V4L2VideoDevice::toV4L2Fourcc(PixelFormat pixelFormat, bool multiplanar case DRM_FORMAT_NV21: return V4L2_PIX_FMT_NV21; + /* Greyscale formats. */ + case DRM_FORMAT_R8: + return V4L2_PIX_FMT_GREY; + /* Compressed formats. */ case DRM_FORMAT_MJPEG: return V4L2_PIX_FMT_MJPEG;