From patchwork Tue Jul 5 15:31:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 16548 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 95C76BD1F1 for ; Tue, 5 Jul 2022 15:31:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4136D61FB0; Tue, 5 Jul 2022 17:31:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657035078; bh=+TYD23Nn4kf1dDcyt8TsXnC9oa0HIPJcFf0qPw0w5Fw=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=EyH9JZ5FcYLV3uv+bjyYqgnv5bTmoEQkVcccggwqJSmF4PALfNg+etSd6xfseen1i yCFSHxUyzeUquyTEhEId6taLaBT7HeOn0XT9gtYcn2jwe0PGhD1J+wdTOxZYqqxhri OAip4Uvp2YtiK7l0R6y2E8woaJwQv5373+U6kwEiUWmiJ6LBYC7mBfeRCQUNQC8tEe OhlgobINEhyh+K6njmJizyonaD0V+lEwjtJzIkeGeW9KEX2kO8RMatay2nKQLSo1mZ PsiQFbGSIE69XHrMRfarld0opLCAv62FNToXttP6NkQAqFgzC2BpoQXZ9GzLWoBXBE lIwCxSSXC4M+w== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BF3836330C for ; Tue, 5 Jul 2022 17:31:15 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="cxHHGV/g"; dkim-atps=neutral Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 460316D1; Tue, 5 Jul 2022 17:31:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657035075; bh=+TYD23Nn4kf1dDcyt8TsXnC9oa0HIPJcFf0qPw0w5Fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cxHHGV/gi6suMeODDHGalkg9r7GH7vWg9+uXUTTLy2ie8Cnzn/wba758FBt8ZmzE3 Y6UrhWZ02HCD/kNue7w4qlywR9Tgv5s9slPa2nToyMm5LX5AiQKMFRAg3Cac2vneWc btUtIWiXfZWCDYYqXFmkvZJnuWH3lOm/IWXVTKqg= To: libcamera devel Date: Tue, 5 Jul 2022 16:31:09 +0100 Message-Id: <20220705153111.2338369-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705153111.2338369-1-kieran.bingham@ideasonboard.com> References: <20220705153111.2338369-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] qcam: viewfinder_qt: Fix include orders 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-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Update the header orders to match the code style as decreed by clang-format. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/qcam/viewfinder_qt.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qcam/viewfinder_qt.cpp b/src/qcam/viewfinder_qt.cpp index 6844f998bbe0..27955e3f9593 100644 --- a/src/qcam/viewfinder_qt.cpp +++ b/src/qcam/viewfinder_qt.cpp @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include @@ -18,9 +20,8 @@ #include #include -#include - #include "../cam/image.h" + #include "format_converter.h" static const QMap nativeFormats From patchwork Tue Jul 5 15:31:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 16549 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 CE553BD1F1 for ; Tue, 5 Jul 2022 15:31:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 23EAF63312; Tue, 5 Jul 2022 17:31:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657035079; bh=w4pli/GmRRpuiI8aQZd0GtzFNnAMuZ5pSGuEdZfpMZg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Ak78NZshv9cmqW7Lsa70CtVwMcAWNh1/YNnQyHXSZKzvZk3SxyJpFKykihznQRlfN I5xw5iBFDFa5ARZN00gLoCCQCxMkCn2ZcUe+DWyHoANUOzyK/omzNoYF6oiGfSPVNy E5kQOcoCDBI/J2YDOJ4N/1GXozNh3L7pJZIOE+WoYRER56xJ1p3vCuleF60FSMb/6n J3TTVxRc6low/8s7m+kr03Yk5KorVs1S14U9DI1GkGhwjNZ/HD0fcx4j81ojeit7+x 5aQBrdgT1TmiucZ7pQIolqgAfHyZ1xEvS/ZPIIiyidmRrvonLCdzDTQOpKVrlnNUZN 8sEgyMjAjUlow== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E7AD96330F for ; Tue, 5 Jul 2022 17:31:15 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="n77/0wNq"; dkim-atps=neutral Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8B94DAFC; Tue, 5 Jul 2022 17:31:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657035075; bh=w4pli/GmRRpuiI8aQZd0GtzFNnAMuZ5pSGuEdZfpMZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n77/0wNqan9ogsebzpPTDedZCxbvMlf8DgzRLL6A8150XRl8rlA6Oj3mq64mzjpwF NX+LMbMdx7mqTaSxU56u5qlaWeoi7MSTcHjCA4bGBD14ORYep+0rE1ObLNBnGHLfDy cTalepvWQTBY6caQQKVgeKaFxGgzwddm7/BgkZuY= To: libcamera devel Date: Tue, 5 Jul 2022 16:31:10 +0100 Message-Id: <20220705153111.2338369-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705153111.2338369-1-kieran.bingham@ideasonboard.com> References: <20220705153111.2338369-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] qcam: format_converter: Support X RGB variants 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-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Support the X variants of the RGB pixel formats along side the equivalent Alpha component based versions. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/qcam/format_converter.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index d4d3223bc698..9331da0ce7a3 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -93,6 +93,7 @@ int FormatConverter::configure(const libcamera::PixelFormat &format, bpp_ = 3; break; case libcamera::formats::ARGB8888: + case libcamera::formats::XRGB8888: formatFamily_ = RGB; r_pos_ = 2; g_pos_ = 1; @@ -100,6 +101,7 @@ int FormatConverter::configure(const libcamera::PixelFormat &format, bpp_ = 4; break; case libcamera::formats::RGBA8888: + case libcamera::formats::RGBX8888: formatFamily_ = RGB; r_pos_ = 3; g_pos_ = 2; @@ -107,6 +109,7 @@ int FormatConverter::configure(const libcamera::PixelFormat &format, bpp_ = 4; break; case libcamera::formats::ABGR8888: + case libcamera::formats::XBGR8888: formatFamily_ = RGB; r_pos_ = 0; g_pos_ = 1; @@ -114,6 +117,7 @@ int FormatConverter::configure(const libcamera::PixelFormat &format, bpp_ = 4; break; case libcamera::formats::BGRA8888: + case libcamera::formats::BGRX8888: formatFamily_ = RGB; r_pos_ = 1; g_pos_ = 2; From patchwork Tue Jul 5 15:31:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 16550 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 8E1DFBD1F1 for ; Tue, 5 Jul 2022 15:31:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A45F963315; Tue, 5 Jul 2022 17:31:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657035079; bh=ou04oLYVdJrSuxYecdHupc43xyesfHa0qHIxCjca6es=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=o+qrhRK/aUZ6mW0LYHPbIbdaLRMe93o+vWoHA2IIxxyVblXE7OgHDyPezySMdOXgl xRaKHAJKDHPHGh7gRZIio4acUOsW2gh72myPf8c/YaFbZGao/3wfjUd+eq+7bfPGEL uYenh05HLc++J6dOj3aWJxj/xqH1P2UPSGAuCoA0Z8OB8gvQFJxP4IyWz3ihmBOd73 I9KSUvN4t7x+AQxbKH33X68+J5Q4Mvy9mlt7e0Skk8/M6WaxRTTlj263oQoXuMbqLp aYbASs4GKxjylCn+vSUXJoZGQPl2Db0Ej2jcxZcfi0PZSThAloSFEQrNbAwJ0duiyn 4iYIJIx8nDABQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3084661FB0 for ; Tue, 5 Jul 2022 17:31:16 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rKqRY78G"; dkim-atps=neutral Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CF3416BB; Tue, 5 Jul 2022 17:31:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657035075; bh=ou04oLYVdJrSuxYecdHupc43xyesfHa0qHIxCjca6es=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rKqRY78GZoyYFGlGshKmiUjKJdidHgPYMxHJKAN4UcDYO7eSvM1xuIAZOp5wq90YB LW7Vks7EUcyFguuomsd6R64sD/9GkRl1HbMSrO/aE/8BQ3yk/t5xHkwRdYbJIEQkMM ZVdFz9p8eSopdgcpfDLvpxTHLxuduGHRL+Fz0m+c= To: libcamera devel Date: Tue, 5 Jul 2022 16:31:11 +0100 Message-Id: <20220705153111.2338369-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705153111.2338369-1-kieran.bingham@ideasonboard.com> References: <20220705153111.2338369-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] qcam: viewfinder_qt: Support X RGB variants 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-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Support the X variants of the RGB pixel formats along side the equivalent Alpha component based versions. Signed-off-by: Kieran Bingham --- src/qcam/viewfinder_qt.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qcam/viewfinder_qt.cpp b/src/qcam/viewfinder_qt.cpp index 27955e3f9593..14ecd70a839e 100644 --- a/src/qcam/viewfinder_qt.cpp +++ b/src/qcam/viewfinder_qt.cpp @@ -28,8 +28,10 @@ static const QMap nativeFormats { #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) { libcamera::formats::ABGR8888, QImage::Format_RGBA8888 }, + { libcamera::formats::XBGR8888, QImage::Format_RGBA8888 }, #endif { libcamera::formats::ARGB8888, QImage::Format_RGB32 }, + { libcamera::formats::XRGB8888, QImage::Format_RGB32 }, #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) { libcamera::formats::RGB888, QImage::Format_BGR888 }, #endif