Patch Detail
Show a patch.
GET /api/patches/9430/?format=api
{ "id": 9430, "url": "https://patchwork.libcamera.org/api/patches/9430/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9430/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200829115429.30010-5-david.plowman@raspberrypi.com>", "date": "2020-08-29T11:54:25", "name": "[libcamera-devel,v5,4/8] libcamera: Allow Bayer pixel formats to be transformed", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2ab90af75f8c709a234f9d1d9efdfb07312c1891", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9430/mbox/", "series": [ { "id": 1252, "url": "https://patchwork.libcamera.org/api/series/1252/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1252", "date": "2020-08-29T11:54:21", "name": "2D transforms", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1252/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9430/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9430/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 0029BBF019\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 29 Aug 2020 11:54:41 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BA7CC6037D;\n\tSat, 29 Aug 2020 13:54:41 +0200 (CEST)", "from mail-wm1-x344.google.com (mail-wm1-x344.google.com\n\t[IPv6:2a00:1450:4864:20::344])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DFA2162919\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 29 Aug 2020 13:54:37 +0200 (CEST)", "by mail-wm1-x344.google.com with SMTP id z9so1426025wmk.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 29 Aug 2020 04:54:37 -0700 (PDT)", "from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tv16sm3071523wmj.14.2020.08.29.04.54.36\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 29 Aug 2020 04:54:36 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"lEWUsuT2\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=WXNfmWM5mhgjldHNikuPTZpRraHHQgBPaE0+RxMTf0I=;\n\tb=lEWUsuT2lC4WeNyt/eFZFaX9iGCC5CIat9EJKbdE39CqxEfhf3ZaDJL7HfMEM6VCew\n\tWKN5CKCtfuKCBbCVZcLVmPLBlWPNeonqtAsWbgp8g6DaaAitQZ8Hk6iodvVc0C0izxI+\n\tkG0jD1jxH3HAWxSjxQoledUg9HH0oyMfFPVF9vWpZqwtOiAW7wVHliiNq3JkQtzPfBhQ\n\taUHgDOkZUKgKGvkThvRAuCnebyOGC3CVoOKVsMcyoa9huypLMLE4zmXQvnvPYdS/As+K\n\tXydQ82IyNQ+nK4mBj70FUuNazRiwUwMRfCD1PBJ1wMignCdu+iTZo3Eq0De8E2kFzvG1\n\t4q1Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=WXNfmWM5mhgjldHNikuPTZpRraHHQgBPaE0+RxMTf0I=;\n\tb=GiLDDZK6YkiychHBB2dZGyvhxjLkrmDz/PS9f78a7ElWCD4SVLF1thf5pUIMWsTFRq\n\t4oNnJXSULKseasuNAeEFLkmyiNinkOng9p2EhLBwE4ufmr2ELN3rzo4r8bGfXvOZq8mS\n\tAhD5l4cVUjLOL7XbGLQoyp3xDS92ht//ALN5OdyHRVKLTnNYwR0VbW7yqbMO7Uoekzuh\n\txcXMyKiXK42ny5PC6e0V84/vGYBElrzfsJpGv6tGrDz5R2AC+nk1bkH6dKWKM/DvY8cg\n\tLwCeYmK7n1dv9Z288Xk19Few6zqYkdOoCDocIG5FneyFYtF/i8agYx/HkOeUJr/0FF42\n\t9fdw==", "X-Gm-Message-State": "AOAM531V7TP9/dwcYhiqpwOi33dLuBKSTb7HDVyuU5SRa18hKtNgvOXs\n\tSlNF5s1HCgtb0ewftADIXCskORHyNL7V/g==", "X-Google-Smtp-Source": "ABdhPJxwkpAJwcKchf+0C49KsdA9aV2AJzTybUaJQNjycccvcxU6BfjH3o0Heh7vlC2KivzGS+2Xqg==", "X-Received": "by 2002:a7b:c5c1:: with SMTP id n1mr2792966wmk.125.1598702077315;\n\tSat, 29 Aug 2020 04:54:37 -0700 (PDT)", "From": "David Plowman <david.plowman@raspberrypi.com>", "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\n\tformats to be transformed", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a transform method to the V4L2PixelFormat class which allows Bayer\nformats to be re-ordered into a different Bayer order when horizontal\nor vertical flips are requested from the sensor.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\n---\n include/libcamera/internal/v4l2_pixelformat.h | 3 +\n src/libcamera/v4l2_pixelformat.cpp | 94 ++++++++++++++++++-\n 2 files changed, 96 insertions(+), 1 deletion(-)", "diff": "diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h\nindex 9bfd81a..cddac86 100644\n--- a/include/libcamera/internal/v4l2_pixelformat.h\n+++ b/include/libcamera/internal/v4l2_pixelformat.h\n@@ -14,6 +14,7 @@\n #include <linux/videodev2.h>\n \n #include <libcamera/pixel_format.h>\n+#include <libcamera/transform.h>\n \n namespace libcamera {\n \n@@ -40,6 +41,8 @@ public:\n \tstatic V4L2PixelFormat fromPixelFormat(const PixelFormat &pixelFormat,\n \t\t\t\t\t bool multiplanar);\n \n+\tV4L2PixelFormat transform(Transform t) const;\n+\n private:\n \tuint32_t fourcc_;\n };\ndiff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\nindex 30c94bb..28bcd51 100644\n--- a/src/libcamera/v4l2_pixelformat.cpp\n+++ b/src/libcamera/v4l2_pixelformat.cpp\n@@ -101,6 +101,62 @@ const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{\n \t{ V4L2PixelFormat(V4L2_PIX_FMT_MJPEG), formats::MJPEG },\n };\n \n+/* Table giving the result of applying an hflip to each Bayer pixel format. */\n+const std::map<V4L2PixelFormat, V4L2PixelFormat> hflipTable{\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16) },\n+};\n+\n+/* Table giving the result of applying a vflip to each Bayer pixel format. */\n+const std::map<V4L2PixelFormat, V4L2PixelFormat> vflipTable{\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16), V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16), V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16), V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16), V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16) },\n+};\n+\n } /* namespace */\n \n /**\n@@ -113,7 +169,7 @@ const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{\n \n /**\n * \\fn V4L2PixelFormat::V4L2PixelFormat(uint32_t fourcc)\n- * \\brief Construct a V4L2PixelFormat from a FourCC value\n+p * \\brief Construct a V4L2PixelFormat from a FourCC value\n * \\param[in] fourcc The pixel format FourCC numerical value\n */\n \n@@ -205,4 +261,40 @@ V4L2PixelFormat V4L2PixelFormat::fromPixelFormat(const PixelFormat &pixelFormat,\n \treturn info.v4l2Format;\n }\n \n+/**\n+ * \\brief Transform a Bayer V4L2PixelFormat.\n+ * \\param[in] t The Transform to be applied to the pixel format.\n+ *\n+ * Some sensors that produce Bayer V4L2PixelFormats may change their Bayer\n+ * order when the V4L2_CID_HFLIP or V4L2_CID_VFLIP controls are applied to the\n+ * device. For such sensors, this function computes the new V4L2PixelFormat\n+ * for the transformed Bayer order.\n+ *\n+ * Transposes are ignored as sensors do not implement them.\n+ *\n+ * \\return The Bayer V4L2PixelFormat resulting from applying transform \\a t\n+ * to the given V4L2PixelFormat.\n+ */\n+V4L2PixelFormat V4L2PixelFormat::transform(Transform t) const\n+{\n+\tV4L2PixelFormat result = *this;\n+\n+\tif (!!(t & Transform::HFlip)) {\n+\t\tconst auto iter = hflipTable.find(*this);\n+\t\tif (iter == hflipTable.end()) {\n+\t\t\tLOG(V4L2, Warning)\n+\t\t\t\t<< \"Cannot transpose V4L2 pixel format \"\n+\t\t\t\t<< toString();\n+\t\t\treturn V4L2PixelFormat();\n+\t\t}\n+\t\tresult = iter->second;\n+\t}\n+\n+\t/* This will be found as the tables have the same keys. */\n+\tif (!!(t & Transform::VFlip))\n+\t\tresult = vflipTable.find(result)->second;\n+\n+\treturn result;\n+}\n+\n } /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "v5", "4/8" ] }