Patch Detail
Show a patch.
GET /api/patches/9267/?format=api
{ "id": 9267, "url": "https://patchwork.libcamera.org/api/patches/9267/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9267/", "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": "<20200806163639.12971-5-david.plowman@raspberrypi.com>", "date": "2020-08-06T16:36:38", "name": "[libcamera-devel,v2,4/5] libcamera: raspberrypi: Plumb user transform through to IPA", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b27893b9bc1c3a2254dddb23dd62f2bb5e154cfd", "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/9267/mbox/", "series": [ { "id": 1208, "url": "https://patchwork.libcamera.org/api/series/1208/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1208", "date": "2020-08-06T16:36:34", "name": "Transform implementation", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1208/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9267/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9267/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 DFA42BD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 6 Aug 2020 16:36:55 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A86FE60BF7;\n\tThu, 6 Aug 2020 18:36:55 +0200 (CEST)", "from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com\n\t[IPv6:2a00:1450:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9CB4C60554\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 6 Aug 2020 18:36:53 +0200 (CEST)", "by mail-wr1-x42e.google.com with SMTP id a14so44655845wra.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 06 Aug 2020 09:36:53 -0700 (PDT)", "from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\te5sm7405076wrc.37.2020.08.06.09.36.51\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 06 Aug 2020 09:36:52 -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=\"Treo+me8\"; 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=OauAAyf3Ed6cD9eIYOvRmW8YEeE/iHxDk0SCcOD30Kc=;\n\tb=Treo+me84xv9sKUNUTlxivaYT0HrdF1CXoRoJdhjY4fSvk2VfUCFPED036OIkAPCGV\n\tMsuznhriKKAFfy6Uu1M5fywJMjFT/KVdj2An4GLt/Ept1c8TCX6TTTtMwom6zleE2g2Z\n\tdi7t1fZosgcfJ5d0X4Li4k36c4XvKCZnOONPgyjvFSHTnGY3jsvvdMWjI8+54OiKx8J0\n\tRKV+ljxxEONlsQnELq696jpr8FqgkHT9nq6WEbysmgQlD3XQWoRqDAPLlQ6rD7M+3Ki9\n\tU3mgsE70+h28qbbXgCRJywP7lrpSeIqrFJPq338zjkLZg3NO+Ld9nu1n/UON4jh8lAx2\n\tIOtA==", "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=OauAAyf3Ed6cD9eIYOvRmW8YEeE/iHxDk0SCcOD30Kc=;\n\tb=VId4ASbnOdnI4t8XCBk+QiaIr9zVKEw1qYfJ2NnVKOdvB2hrSGfHM89iR3aSIsN5Xm\n\ttZjhl1xlfytfXBVIq12VvrRhDa7niqP8fV0QFfr8wL8qGxuIF57iQae5TfN/DVKhFu1P\n\tckGDKENI6xRVc5jZCtQrEOqWFIkUqq/RyIYGxerC2o6hAtvrFTT8fq/9Q/Gz6226fiSN\n\tes8Zdh+cbc+fuRzCb+BNdUULr1CYnxYi5Nw8UnjsRQrmDLmGy7rxJNW/50OUUB4aeo0M\n\tgcIFEyxDBWJM6PchWUCpfLt5PMvT/IhZjSGWzESmnnp9o7Pj8JdazhZoQFwAK1Sj7laS\n\tuNzg==", "X-Gm-Message-State": "AOAM53012eU8v4Y1fzobc/e2Jl0qpQZPrvn1LoppwANk+w3SGTe14hmA\n\tjWNaRh1AayiMSyB0+jYvYQU6VjwOuPY+gw==", "X-Google-Smtp-Source": "ABdhPJyShsoj4zkm1CUNG3iL8pb/MAxXJgYgrmLbxikNVhvZtj4dHFRXgDs9c8ku/tH3dNVr2OL/6g==", "X-Received": "by 2002:a5d:460c:: with SMTP id\n\tt12mr8552280wrq.334.1596731812874; \n\tThu, 06 Aug 2020 09:36:52 -0700 (PDT)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 6 Aug 2020 17:36:38 +0100", "Message-Id": "<20200806163639.12971-5-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200806163639.12971-1-david.plowman@raspberrypi.com>", "References": "<20200806163639.12971-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 4/5] libcamera: raspberrypi: Plumb user\n\ttransform through to IPA", "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": "This commit plumbs the user transform from the Raspberry Pi pipeline\nhandler through to the IPA. Once in the IPA we add it to the\nCameraMode description, so that it becomes automatically available to\nall the individual control algorithms.\n\nThe IPA configure method has to be reordered just a little so as to\nfill in the transform in the camera mode before calling SwitchMode.\n---\n src/ipa/raspberrypi/controller/camera_mode.h | 4 ++\n src/ipa/raspberrypi/raspberrypi.cpp | 48 +++++++++++--------\n .../pipeline/raspberrypi/raspberrypi.cpp | 5 +-\n 3 files changed, 35 insertions(+), 22 deletions(-)", "diff": "diff --git a/src/ipa/raspberrypi/controller/camera_mode.h b/src/ipa/raspberrypi/controller/camera_mode.h\nindex 875bab3..920f11b 100644\n--- a/src/ipa/raspberrypi/controller/camera_mode.h\n+++ b/src/ipa/raspberrypi/controller/camera_mode.h\n@@ -6,6 +6,8 @@\n */\n #pragma once\n \n+#include <libcamera/transform.h>\n+\n // Description of a \"camera mode\", holding enough information for control\n // algorithms to adapt their behaviour to the different modes of the camera,\n // including binning, scaling, cropping etc.\n@@ -33,6 +35,8 @@ struct CameraMode {\n \tdouble noise_factor;\n \t// line time in nanoseconds\n \tdouble line_length;\n+\t// any camera transform *not* reflected already in the camera tuning\n+\tlibcamera::Transform transform;\n };\n \n #ifdef __cplusplus\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 3747208..0b36d57 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -232,6 +232,33 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t/* Re-assemble camera mode using the sensor info. */\n \tsetMode(sensorInfo);\n \n+\t/*\n+\t * The ipaConfig.data always gives us the user transform first. Note that\n+\t * this will always make the LS table pointer (if present) element 1.\n+\t */\n+\tmode_.transform = static_cast<libcamera::Transform>(ipaConfig.data[0]);\n+\n+\t/* Store the lens shading table pointer and handle if available. */\n+\tif (ipaConfig.operation & RPI_IPA_CONFIG_LS_TABLE) {\n+\t\t/* Remove any previous table, if there was one. */\n+\t\tif (lsTable_) {\n+\t\t\tmunmap(lsTable_, MAX_LS_GRID_SIZE);\n+\t\t\tlsTable_ = nullptr;\n+\t\t}\n+\n+\t\t/* Map the LS table buffer into user space (now element 1). */\n+\t\tlsTableHandle_ = FileDescriptor(ipaConfig.data[1]);\n+\t\tif (lsTableHandle_.isValid()) {\n+\t\t\tlsTable_ = mmap(nullptr, MAX_LS_GRID_SIZE, PROT_READ | PROT_WRITE,\n+\t\t\t\t\tMAP_SHARED, lsTableHandle_.fd(), 0);\n+\n+\t\t\tif (lsTable_ == MAP_FAILED) {\n+\t\t\t\tLOG(IPARPI, Error) << \"dmaHeap mmap failure for LS table.\";\n+\t\t\t\tlsTable_ = nullptr;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n \t/* Pass the camera mode to the CamHelper to setup algorithms. */\n \thelper_->SetCameraMode(mode_);\n \n@@ -280,27 +307,6 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t}\n \n \tlastMode_ = mode_;\n-\n-\t/* Store the lens shading table pointer and handle if available. */\n-\tif (ipaConfig.operation & RPI_IPA_CONFIG_LS_TABLE) {\n-\t\t/* Remove any previous table, if there was one. */\n-\t\tif (lsTable_) {\n-\t\t\tmunmap(lsTable_, MAX_LS_GRID_SIZE);\n-\t\t\tlsTable_ = nullptr;\n-\t\t}\n-\n-\t\t/* Map the LS table buffer into user space. */\n-\t\tlsTableHandle_ = FileDescriptor(ipaConfig.data[0]);\n-\t\tif (lsTableHandle_.isValid()) {\n-\t\t\tlsTable_ = mmap(nullptr, MAX_LS_GRID_SIZE, PROT_READ | PROT_WRITE,\n-\t\t\t\t\tMAP_SHARED, lsTableHandle_.fd(), 0);\n-\n-\t\t\tif (lsTable_ == MAP_FAILED) {\n-\t\t\t\tLOG(IPARPI, Error) << \"dmaHeap mmap failure for LS table.\";\n-\t\t\t\tlsTable_ = nullptr;\n-\t\t\t}\n-\t\t}\n-\t}\n }\n \n void IPARPi::mapBuffers(const std::vector<IPABuffer> &buffers)\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 9d183e3..2fdf79f 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1141,6 +1141,9 @@ int RPiCameraData::configureIPA()\n \tentityControls.emplace(0, unicam_[Unicam::Image].dev()->controls());\n \tentityControls.emplace(1, isp_[Isp::Input].dev()->controls());\n \n+\t/* Always send the user transform to the IPA. */\n+\tipaConfig.data = { static_cast<unsigned int>(transform_) };\n+\n \t/* Allocate the lens shading table via dmaHeap and pass to the IPA. */\n \tif (!lsTable_.isValid()) {\n \t\tlsTable_ = dmaHeap_.alloc(\"ls_grid\", MAX_LS_GRID_SIZE);\n@@ -1149,7 +1152,7 @@ int RPiCameraData::configureIPA()\n \n \t\t/* Allow the IPA to mmap the LS table via the file descriptor. */\n \t\tipaConfig.operation = RPI_IPA_CONFIG_LS_TABLE;\n-\t\tipaConfig.data = { static_cast<unsigned int>(lsTable_.fd()) };\n+\t\tipaConfig.data.push_back(static_cast<unsigned int>(lsTable_.fd()));\n \t}\n \n \tCameraSensorInfo sensorInfo = {};\n", "prefixes": [ "libcamera-devel", "v2", "4/5" ] }