{"id":9508,"url":"https://patchwork.libcamera.org/api/1.1/patches/9508/?format=json","web_url":"https://patchwork.libcamera.org/patch/9508/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200907071604.8355-8-david.plowman@raspberrypi.com>","date":"2020-09-07T07:16:02","name":"[libcamera-devel,v8,7/8] libcamera: raspberrypi: Plumb user transform through to IPA","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6bad0ef0f6587ae51b55fed6a235cfcfb94404e0","submitter":{"id":42,"url":"https://patchwork.libcamera.org/api/1.1/people/42/?format=json","name":"David Plowman","email":"david.plowman@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9508/mbox/","series":[{"id":1268,"url":"https://patchwork.libcamera.org/api/1.1/series/1268/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1268","date":"2020-09-07T07:15:55","name":"2D transforms","version":8,"mbox":"https://patchwork.libcamera.org/series/1268/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9508/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9508/checks/","tags":{},"headers":{"Return-Path":"","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 AAFEBBDB1C\n\tfor ;\n\tMon, 7 Sep 2020 07:16:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5BF9262BD8;\n\tMon, 7 Sep 2020 09:16:17 +0200 (CEST)","from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com\n\t[IPv6:2a00:1450:4864:20::32e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C517262B76\n\tfor ;\n\tMon, 7 Sep 2020 09:16:14 +0200 (CEST)","by mail-wm1-x32e.google.com with SMTP id z9so13129516wmk.1\n\tfor ;\n\tMon, 07 Sep 2020 00:16:14 -0700 (PDT)","from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tb2sm25543636wmh.47.2020.09.07.00.16.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 07 Sep 2020 00:16:13 -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=\"gdv6Ds0v\"; 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=Yzyp/Th6ola42zb0spg5zOf8wnWKiWtQKGOY2h2rldo=;\n\tb=gdv6Ds0v+v8uwJmFSfvUYaV3Y9hCFsT1baR2yjyZyhRYkurObFt0vfVKs4pz39iJrx\n\tRdcgQDFGuzIIw3erSQPw6quev5fRbKQzbtWn8zcVZt2xATGMmu7eXAkFeg/HzYZfqqPi\n\tfX7PC3IUJ/0aF4b6wIOPrLhUttoXELFHMUNRcZzx+Ezv47M3Th8DJvIedQZMiYEgyYGt\n\teONgRoQyULQKQqXuDNshNwxnEUHuWLZMloHecHjpMMrFsfhaoix1nOykMm2WhFuGCdQ0\n\tbf5fIIt25lfjyD6ZDC60RirZ56GHJC/NRQnhnSvBQ4N7rpDcUJ1q8ZKIbctsDz+nWg/9\n\tNN+w==","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=Yzyp/Th6ola42zb0spg5zOf8wnWKiWtQKGOY2h2rldo=;\n\tb=tFnaIqWzETBrPrs6yObaD2QugyBK2e30fHnPi6waJ6PVDa+XSll4DYzjxL7Jh3wSuP\n\tzLmYjWXt/tM49lVak34pS6uScgHGr7v9tiFcRq/hHNJIecHRMGkrqMZqpXL3CLxtUAXF\n\taF+iKK2EgYaXHtpXaYC3afSVBashtTRRErFNbGmZSYjPp3ml+buyAFYCsx66O3g6igNN\n\tz20RHN0eJY65w+oxHppFYlYxD7DJTCgtrMTKq79iV4FXiHl3PepSs5NtlKLNuTyXP2uI\n\t+tNylYHlQ4Le068j0JCRHhOtdLtmXEh6Jfw/Bp9NBd9lK6qOwWD0VA+V/N7fHx5Olq+r\n\teF8Q==","X-Gm-Message-State":"AOAM532dLk/yVnYsAnc0pUlRM7aRBtCW6wb0P2NF2zhH6o5XPH2TtJfa\n\tNguGM5V15MdkkJ2fYMDCIut+kVnvUt8o0w==","X-Google-Smtp-Source":"ABdhPJwc9RAqN+lWIi6C8hB1131oi9+f9AKUjAsIioq8bkCy6Up47Nx4q2Tc90h3ADLHF7J5Bcbrrw==","X-Received":"by 2002:a1c:4e02:: with SMTP id g2mr18441494wmh.3.1599462974198; \n\tMon, 07 Sep 2020 00:16:14 -0700 (PDT)","From":"David Plowman ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 7 Sep 2020 08:16:02 +0100","Message-Id":"<20200907071604.8355-8-david.plowman@raspberrypi.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200907071604.8355-1-david.plowman@raspberrypi.com>","References":"<20200907071604.8355-1-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v8 7/8] 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This commit plumbs the user transform from the Raspberry Pi pipeline\nhandler through to the IPA. Note that the transform is actually\nhandled in the sensor (by setting the h/v flip bits), so the IPAs need\nto understand the orientation of the image they receive.\n\nOnce in the IPA we add it to the CameraMode description, so that it\nbecomes automatically available to all the individual control\nalgorithms.\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\nSigned-off-by: David Plowman \nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \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 \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 4557016..c730326 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(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 &buffers)\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex cc9af2c..af294a7 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1261,6 +1261,9 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\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(config->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@@ -1269,7 +1272,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\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(lsTable_.fd()) };\n+\t\tipaConfig.data.push_back(static_cast(lsTable_.fd()));\n \t}\n \n \tCameraSensorInfo sensorInfo = {};\n","prefixes":["libcamera-devel","v8","7/8"]}