From patchwork Sat Jul 18 14:34:27 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: 8860 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 00AEFBD792 for ; Sat, 18 Jul 2020 14:34:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B6D92605BF; Sat, 18 Jul 2020 16:34:45 +0200 (CEST) Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 035726053A for ; Sat, 18 Jul 2020 16:34:42 +0200 (CEST) X-Halon-ID: d12eb322-c903-11ea-8fb8-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id d12eb322-c903-11ea-8fb8-005056917f90; Sat, 18 Jul 2020 16:34:42 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sat, 18 Jul 2020 16:34:27 +0200 Message-Id: <20200718143428.1060441-2-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200718143428.1060441-1-niklas.soderlund@ragnatech.se> References: <20200718143428.1060441-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: Add support for planar YVU420 format 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add support for planar YVU420. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/libcamera/formats.cpp | 10 ++++++++++ src/libcamera/formats.yaml | 2 ++ src/libcamera/v4l2_pixelformat.cpp | 1 + 3 files changed, 13 insertions(+) diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index 3f895a7c2badc34a..8f9bdafe821b2e69 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -407,6 +407,16 @@ const std::map pixelFormatInfo{ .pixelsPerGroup = 2, .planes = {{ { 2, 1 }, { 1, 2 }, { 1, 2 } }}, } }, + { formats::YVU420, { + .name = "YVU420", + .format = PixelFormat(formats::YVU420), + .v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YVU420), + .bitsPerPixel = 12, + .colourEncoding = PixelFormatInfo::ColourEncodingYUV, + .packed = false, + .pixelsPerGroup = 2, + .planes = {{ { 2, 1 }, { 1, 2 }, { 1, 2 } }}, + } }, { formats::YUV422, { .name = "YUV422", .format = PixelFormat(formats::YUV422), diff --git a/src/libcamera/formats.yaml b/src/libcamera/formats.yaml index ce06dbc41aa13f5e..6b5f084bb2e4e970 100644 --- a/src/libcamera/formats.yaml +++ b/src/libcamera/formats.yaml @@ -55,6 +55,8 @@ formats: - YUV420: fourcc: DRM_FORMAT_YUV420 + - YVU420: + fourcc: DRM_FORMAT_YVU420 - YUV422: fourcc: DRM_FORMAT_YUV422 diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 6745d17d49269bab..1609f8bb6370fa65 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -64,6 +64,7 @@ const std::map vpf2pf{ { V4L2PixelFormat(V4L2_PIX_FMT_NV12), formats::NV12 }, { V4L2PixelFormat(V4L2_PIX_FMT_NV21), formats::NV21 }, { V4L2PixelFormat(V4L2_PIX_FMT_YUV420), formats::YUV420 }, + { V4L2PixelFormat(V4L2_PIX_FMT_YVU420), formats::YVU420}, { V4L2PixelFormat(V4L2_PIX_FMT_YUV422P), formats::YUV422 }, /* Greyscale formats. */ From patchwork Sat Jul 18 14:34:28 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: 8861 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 597EAC2E67 for ; Sat, 18 Jul 2020 14:34:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3DF15605C6; Sat, 18 Jul 2020 16:34:46 +0200 (CEST) Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5880060544 for ; Sat, 18 Jul 2020 16:34:43 +0200 (CEST) X-Halon-ID: d17a15d8-c903-11ea-8fb8-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id d17a15d8-c903-11ea-8fb8-005056917f90; Sat, 18 Jul 2020 16:34:42 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sat, 18 Jul 2020 16:34:28 +0200 Message-Id: <20200718143428.1060441-3-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200718143428.1060441-1-niklas.soderlund@ragnatech.se> References: <20200718143428.1060441-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] libcamera: Add support for RGB565 format 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add support for RGB565 format. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/libcamera/formats.cpp | 10 ++++++++++ src/libcamera/formats.yaml | 3 +++ src/libcamera/v4l2_pixelformat.cpp | 1 + 3 files changed, 14 insertions(+) diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index 8f9bdafe821b2e69..af3996c954ae1457 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -233,6 +233,16 @@ const PixelFormatInfo pixelFormatInfoInvalid{}; const std::map pixelFormatInfo{ /* RGB formats. */ + { formats::RGB565, { + .name = "RGB565", + .format = formats::RGB565, + .v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGB565), + .bitsPerPixel = 16, + .colourEncoding = PixelFormatInfo::ColourEncodingRGB, + .packed = false, + .pixelsPerGroup = 1, + .planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }}, + } }, { formats::BGR888, { .name = "BGR888", .format = formats::BGR888, diff --git a/src/libcamera/formats.yaml b/src/libcamera/formats.yaml index 6b5f084bb2e4e970..3a69c05fcc04fb93 100644 --- a/src/libcamera/formats.yaml +++ b/src/libcamera/formats.yaml @@ -8,6 +8,9 @@ formats: - R8: fourcc: DRM_FORMAT_R8 + - RGB565: + fourcc: DRM_FORMAT_RGB565 + - RGB888: fourcc: DRM_FORMAT_RGB888 - BGR888: diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 1609f8bb6370fa65..9799d389e20b358d 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -45,6 +45,7 @@ namespace { const std::map vpf2pf{ /* RGB formats. */ + { V4L2PixelFormat(V4L2_PIX_FMT_RGB565), formats::RGB565 }, { V4L2PixelFormat(V4L2_PIX_FMT_RGB24), formats::BGR888 }, { V4L2PixelFormat(V4L2_PIX_FMT_BGR24), formats::RGB888 }, { V4L2PixelFormat(V4L2_PIX_FMT_RGBA32), formats::ABGR8888 },