From patchwork Sat Aug 29 11:54:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 9430 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 0029BBF019 for ; Sat, 29 Aug 2020 11:54:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BA7CC6037D; Sat, 29 Aug 2020 13:54:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="lEWUsuT2"; dkim-atps=neutral Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DFA2162919 for ; Sat, 29 Aug 2020 13:54:37 +0200 (CEST) Received: by mail-wm1-x344.google.com with SMTP id z9so1426025wmk.1 for ; Sat, 29 Aug 2020 04:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WXNfmWM5mhgjldHNikuPTZpRraHHQgBPaE0+RxMTf0I=; b=lEWUsuT2lC4WeNyt/eFZFaX9iGCC5CIat9EJKbdE39CqxEfhf3ZaDJL7HfMEM6VCew WKN5CKCtfuKCBbCVZcLVmPLBlWPNeonqtAsWbgp8g6DaaAitQZ8Hk6iodvVc0C0izxI+ kG0jD1jxH3HAWxSjxQoledUg9HH0oyMfFPVF9vWpZqwtOiAW7wVHliiNq3JkQtzPfBhQ aUHgDOkZUKgKGvkThvRAuCnebyOGC3CVoOKVsMcyoa9huypLMLE4zmXQvnvPYdS/As+K XydQ82IyNQ+nK4mBj70FUuNazRiwUwMRfCD1PBJ1wMignCdu+iTZo3Eq0De8E2kFzvG1 4q1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WXNfmWM5mhgjldHNikuPTZpRraHHQgBPaE0+RxMTf0I=; b=GiLDDZK6YkiychHBB2dZGyvhxjLkrmDz/PS9f78a7ElWCD4SVLF1thf5pUIMWsTFRq 4oNnJXSULKseasuNAeEFLkmyiNinkOng9p2EhLBwE4ufmr2ELN3rzo4r8bGfXvOZq8mS AhD5l4cVUjLOL7XbGLQoyp3xDS92ht//ALN5OdyHRVKLTnNYwR0VbW7yqbMO7Uoekzuh xcXMyKiXK42ny5PC6e0V84/vGYBElrzfsJpGv6tGrDz5R2AC+nk1bkH6dKWKM/DvY8cg LwCeYmK7n1dv9Z288Xk19Few6zqYkdOoCDocIG5FneyFYtF/i8agYx/HkOeUJr/0FF42 9fdw== X-Gm-Message-State: AOAM531V7TP9/dwcYhiqpwOi33dLuBKSTb7HDVyuU5SRa18hKtNgvOXs SlNF5s1HCgtb0ewftADIXCskORHyNL7V/g== X-Google-Smtp-Source: ABdhPJxwkpAJwcKchf+0C49KsdA9aV2AJzTybUaJQNjycccvcxU6BfjH3o0Heh7vlC2KivzGS+2Xqg== X-Received: by 2002:a7b:c5c1:: with SMTP id n1mr2792966wmk.125.1598702077315; Sat, 29 Aug 2020 04:54:37 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id v16sm3071523wmj.14.2020.08.29.04.54.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2020 04:54:36 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Sat, 29 Aug 2020 12:54:25 +0100 Message-Id: <20200829115429.30010-5-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200829115429.30010-1-david.plowman@raspberrypi.com> References: <20200829115429.30010-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 4/8] libcamera: Allow Bayer pixel formats to be transformed 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 a transform method to the V4L2PixelFormat class which allows Bayer formats to be re-ordered into a different Bayer order when horizontal or vertical flips are requested from the sensor. Signed-off-by: David Plowman --- include/libcamera/internal/v4l2_pixelformat.h | 3 + src/libcamera/v4l2_pixelformat.cpp | 94 ++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h index 9bfd81a..cddac86 100644 --- a/include/libcamera/internal/v4l2_pixelformat.h +++ b/include/libcamera/internal/v4l2_pixelformat.h @@ -14,6 +14,7 @@ #include #include +#include namespace libcamera { @@ -40,6 +41,8 @@ public: static V4L2PixelFormat fromPixelFormat(const PixelFormat &pixelFormat, bool multiplanar); + V4L2PixelFormat transform(Transform t) const; + private: uint32_t fourcc_; }; diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 30c94bb..28bcd51 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -101,6 +101,62 @@ const std::map vpf2pf{ { V4L2PixelFormat(V4L2_PIX_FMT_MJPEG), formats::MJPEG }, }; +/* Table giving the result of applying an hflip to each Bayer pixel format. */ +const std::map hflipTable{ + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16) }, +}; + +/* Table giving the result of applying a vflip to each Bayer pixel format. */ +const std::map vflipTable{ + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16) }, + { V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16) }, +}; + } /* namespace */ /** @@ -113,7 +169,7 @@ const std::map vpf2pf{ /** * \fn V4L2PixelFormat::V4L2PixelFormat(uint32_t fourcc) - * \brief Construct a V4L2PixelFormat from a FourCC value +p * \brief Construct a V4L2PixelFormat from a FourCC value * \param[in] fourcc The pixel format FourCC numerical value */ @@ -205,4 +261,40 @@ V4L2PixelFormat V4L2PixelFormat::fromPixelFormat(const PixelFormat &pixelFormat, return info.v4l2Format; } +/** + * \brief Transform a Bayer V4L2PixelFormat. + * \param[in] t The Transform to be applied to the pixel format. + * + * Some sensors that produce Bayer V4L2PixelFormats may change their Bayer + * order when the V4L2_CID_HFLIP or V4L2_CID_VFLIP controls are applied to the + * device. For such sensors, this function computes the new V4L2PixelFormat + * for the transformed Bayer order. + * + * Transposes are ignored as sensors do not implement them. + * + * \return The Bayer V4L2PixelFormat resulting from applying transform \a t + * to the given V4L2PixelFormat. + */ +V4L2PixelFormat V4L2PixelFormat::transform(Transform t) const +{ + V4L2PixelFormat result = *this; + + if (!!(t & Transform::HFlip)) { + const auto iter = hflipTable.find(*this); + if (iter == hflipTable.end()) { + LOG(V4L2, Warning) + << "Cannot transpose V4L2 pixel format " + << toString(); + return V4L2PixelFormat(); + } + result = iter->second; + } + + /* This will be found as the tables have the same keys. */ + if (!!(t & Transform::VFlip)) + result = vflipTable.find(result)->second; + + return result; +} + } /* namespace libcamera */