{"id":9064,"url":"https://patchwork.libcamera.org/api/1.1/patches/9064/?format=json","web_url":"https://patchwork.libcamera.org/patch/9064/","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":"<20200729093154.12296-4-david.plowman@raspberrypi.com>","date":"2020-07-29T09:31:52","name":"[libcamera-devel,3/5] libcamera: raspberrypi: Plumb user transform through to individual IPAs","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5c092828a013b57bb9525b5baab4b36aff919ed2","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/9064/mbox/","series":[{"id":1160,"url":"https://patchwork.libcamera.org/api/1.1/series/1160/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1160","date":"2020-07-29T09:31:50","name":"Transform implementation","version":1,"mbox":"https://patchwork.libcamera.org/series/1160/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9064/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9064/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 F02D4BD86F\n\tfor ;\n\tWed, 29 Jul 2020 09:32:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 90ACB61A22;\n\tWed, 29 Jul 2020 11:32:08 +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 3F46E618F9\n\tfor ;\n\tWed, 29 Jul 2020 11:32:04 +0200 (CEST)","by mail-wm1-x32e.google.com with SMTP id k8so2249446wma.2\n\tfor ;\n\tWed, 29 Jul 2020 02:32:04 -0700 (PDT)","from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tc15sm3709921wme.23.2020.07.29.02.32.01\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 29 Jul 2020 02:32:02 -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=\"tjNLQ59y\"; 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=lgGaAYi8JaqVKMBv1HpSYJu1triMv0BwSG5MsK1P0eY=;\n\tb=tjNLQ59yyx+XWiY+fkpkSFbW9A1Wj4OsY6o97Kp+i2ZDQe1W45Maes/b+CjZwKBj6v\n\tCp0qpA56qKL6gaAc0RJ5O67TleKu+RIPnZM9/GA8x+gYCqugNZIerrABW7jAKUX+Thv9\n\tk5gz1w9G+lum0qE+F7E1GWJwi3OIEkX39bF/+emS1y5HfnNlixlSbWGZqg/ZezbTC27x\n\tQ3HwB66NPplwKWHdhhOtZFxF52WWj22mXu1uZ8BPlv/URge+RyG6UN9rsfuyvCL8VlKF\n\t9ISoi2fZcqHvS4zWvouifCk5JqNOEY8h6U5JRdIvh+2lMGP02ulHXM6sH+JEltr8bngu\n\tcnHg==","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=lgGaAYi8JaqVKMBv1HpSYJu1triMv0BwSG5MsK1P0eY=;\n\tb=loHG0+zsTm/hALIc4+oIZ4F/66Ft4NTXU+AV5g52XfFJlX0rdHopsBtrvZENyf+e/J\n\tcMMxOdprVSU7k0W3S6IXkYmWJ/8M1t1KVii3gwWNrtatneeUqbnJ4zj0aGT7OqLcf2bc\n\tcFV/LNYCWkE6+aJ4ZwiAHT6FZ3CfdxfFPIcuDyDIa4Yg2Hyw1RbLCNYslRr4wKDKSkcj\n\tylxALHTY/WYOfKt2JBCmoTmd15jMGQTfUnN1UpTvh9YjKCcl8E1zT0U9Ks3sYHaOdktu\n\t311tladfzXLbuedSDHrDlAu9s1bZRW/K4eLHPn17PSeqbih3+2COX9oy5e0Y4fzsU86+\n\tQAnQ==","X-Gm-Message-State":"AOAM533MV/QE9pn5dC0688xbxk+yDlJDisvcC9mwAP9/b47t2KmlpWN/\n\t50l93nZY0LQAdx4eOn/ahBCONndtTorQYQ==","X-Google-Smtp-Source":"ABdhPJxrW6FUGGhKzpZF3KTFV4rFy8oDgsqQhUVIv6lk3jFKgm8+hlfmyBnHWu2gIGVQ/Ic/E70iqw==","X-Received":"by 2002:a1c:7705:: with SMTP id t5mr8117452wmi.112.1596015122588;\n\tWed, 29 Jul 2020 02:32:02 -0700 (PDT)","From":"David Plowman ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 29 Jul 2020 10:31:52 +0100","Message-Id":"<20200729093154.12296-4-david.plowman@raspberrypi.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200729093154.12296-1-david.plowman@raspberrypi.com>","References":"<20200729093154.12296-1-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 3/5] libcamera: raspberrypi: Plumb user\n\ttransform through to individual IPAs","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 takes the user/application supplied Transform and plumbs\nit through to all our individual IPAs using the SwitchMode method of\nthe Controller/Algorithms. IPARPi::configure has to be re-ordered just\na little to ensure the userTransform_ is available before calling\nSwitchMode.\n---\n src/ipa/raspberrypi/controller/algorithm.cpp | 4 ++-\n src/ipa/raspberrypi/controller/algorithm.hpp | 3 +-\n src/ipa/raspberrypi/controller/controller.cpp | 5 +--\n src/ipa/raspberrypi/controller/controller.hpp | 5 ++-\n src/ipa/raspberrypi/controller/rpi/agc.cpp | 3 +-\n src/ipa/raspberrypi/controller/rpi/agc.hpp | 3 +-\n src/ipa/raspberrypi/controller/rpi/alsc.cpp | 3 +-\n src/ipa/raspberrypi/controller/rpi/alsc.hpp | 3 +-\n src/ipa/raspberrypi/controller/rpi/noise.cpp | 4 ++-\n src/ipa/raspberrypi/controller/rpi/noise.hpp | 3 +-\n .../raspberrypi/controller/rpi/sharpen.cpp | 3 +-\n .../raspberrypi/controller/rpi/sharpen.hpp | 3 +-\n src/ipa/raspberrypi/raspberrypi.cpp | 31 ++++++++++---------\n 13 files changed, 45 insertions(+), 28 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/controller/algorithm.cpp b/src/ipa/raspberrypi/controller/algorithm.cpp\nindex 55cb201..b95ebb8 100644\n--- a/src/ipa/raspberrypi/controller/algorithm.cpp\n+++ b/src/ipa/raspberrypi/controller/algorithm.cpp\n@@ -16,9 +16,11 @@ void Algorithm::Read(boost::property_tree::ptree const ¶ms)\n \n void Algorithm::Initialise() {}\n \n-void Algorithm::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n+void Algorithm::SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\t\t Metadata *metadata)\n {\n \t(void)camera_mode;\n+\t(void)transform;\n \t(void)metadata;\n }\n \ndiff --git a/src/ipa/raspberrypi/controller/algorithm.hpp b/src/ipa/raspberrypi/controller/algorithm.hpp\nindex 187c50c..b38f167 100644\n--- a/src/ipa/raspberrypi/controller/algorithm.hpp\n+++ b/src/ipa/raspberrypi/controller/algorithm.hpp\n@@ -37,7 +37,8 @@ public:\n \tvirtual void Resume() { paused_ = false; }\n \tvirtual void Read(boost::property_tree::ptree const ¶ms);\n \tvirtual void Initialise();\n-\tvirtual void SwitchMode(CameraMode const &camera_mode, Metadata *metadata);\n+\tvirtual void SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\t\t\tMetadata *metadata);\n \tvirtual void Prepare(Metadata *image_metadata);\n \tvirtual void Process(StatisticsPtr &stats, Metadata *image_metadata);\n \tMetadata &GetGlobalMetadata() const\ndiff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp\nindex 7c4b04f..7a4310f 100644\n--- a/src/ipa/raspberrypi/controller/controller.cpp\n+++ b/src/ipa/raspberrypi/controller/controller.cpp\n@@ -56,11 +56,12 @@ void Controller::Initialise()\n \tRPI_LOG(\"Controller finished\");\n }\n \n-void Controller::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n+void Controller::SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\t\t\tMetadata *metadata)\n {\n \tRPI_LOG(\"Controller starting\");\n \tfor (auto &algo : algorithms_)\n-\t\talgo->SwitchMode(camera_mode, metadata);\n+\t\talgo->SwitchMode(camera_mode, transform, metadata);\n \tswitch_mode_called_ = true;\n \tRPI_LOG(\"Controller finished\");\n }\ndiff --git a/src/ipa/raspberrypi/controller/controller.hpp b/src/ipa/raspberrypi/controller/controller.hpp\nindex 6ba9412..738c4b6 100644\n--- a/src/ipa/raspberrypi/controller/controller.hpp\n+++ b/src/ipa/raspberrypi/controller/controller.hpp\n@@ -15,6 +15,8 @@\n \n #include \n \n+#include \n+\n #include \"camera_mode.h\"\n #include \"device_status.h\"\n #include \"metadata.hpp\"\n@@ -39,7 +41,8 @@ public:\n \tAlgorithm *CreateAlgorithm(char const *name);\n \tvoid Read(char const *filename);\n \tvoid Initialise();\n-\tvoid SwitchMode(CameraMode const &camera_mode, Metadata *metadata);\n+\tvoid SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\tMetadata *metadata);\n \tvoid Prepare(Metadata *image_metadata);\n \tvoid Process(StatisticsPtr stats, Metadata *image_metadata);\n \tMetadata &GetGlobalMetadata();\ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp\nindex c02b5ec..ceac771 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp\n@@ -221,7 +221,8 @@ void Agc::SetConstraintMode(std::string const &constraint_mode_name)\n \tconstraint_mode_name_ = constraint_mode_name;\n }\n \n-void Agc::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n+void Agc::SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\t Metadata *metadata)\n {\n \t// On a mode switch, it's possible the exposure profile could change,\n \t// so we run through the dividing up of exposure/gain again and\ndiff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp\nindex 9a7e89c..78f016e 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp\n@@ -75,7 +75,8 @@ public:\n \tvoid SetMeteringMode(std::string const &metering_mode_name) override;\n \tvoid SetExposureMode(std::string const &exposure_mode_name) override;\n \tvoid SetConstraintMode(std::string const &contraint_mode_name) override;\n-\tvoid SwitchMode(CameraMode const &camera_mode, Metadata *metadata) override;\n+\tvoid SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\tMetadata *metadata) override;\n \tvoid Prepare(Metadata *image_metadata) override;\n \tvoid Process(StatisticsPtr &stats, Metadata *image_metadata) override;\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\nindex 76e2f04..5fac9dd 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n@@ -12,6 +12,7 @@\n // Raspberry Pi ALSC (Auto Lens Shading Correction) algorithm.\n \n using namespace RPi;\n+using libcamera::Transform;\n \n #define NAME \"rpi.alsc\"\n \n@@ -173,7 +174,7 @@ void Alsc::Initialise()\n \t\tlambda_r_[i] = lambda_b_[i] = 1.0;\n }\n \n-void Alsc::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n+void Alsc::SwitchMode(CameraMode const &camera_mode, Transform transform, Metadata *metadata)\n {\n \t(void)metadata;\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/alsc.hpp b/src/ipa/raspberrypi/controller/rpi/alsc.hpp\nindex 3806257..9b54578 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.hpp\n@@ -50,7 +50,8 @@ public:\n \t~Alsc();\n \tchar const *Name() const override;\n \tvoid Initialise() override;\n-\tvoid SwitchMode(CameraMode const &camera_mode, Metadata *metadata) override;\n+\tvoid SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\tMetadata *metadata) override;\n \tvoid Read(boost::property_tree::ptree const ¶ms) override;\n \tvoid Prepare(Metadata *image_metadata) override;\n \tvoid Process(StatisticsPtr &stats, Metadata *image_metadata) override;\ndiff --git a/src/ipa/raspberrypi/controller/rpi/noise.cpp b/src/ipa/raspberrypi/controller/rpi/noise.cpp\nindex 2cafde3..0f4002b 100644\n--- a/src/ipa/raspberrypi/controller/rpi/noise.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/noise.cpp\n@@ -27,8 +27,10 @@ char const *Noise::Name() const\n \treturn NAME;\n }\n \n-void Noise::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n+void Noise::SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\t Metadata *metadata)\n {\n+\t(void)transform;\n \t(void)metadata;\n \n \t// For example, we would expect a 2x2 binned mode to have a \"noise\ndiff --git a/src/ipa/raspberrypi/controller/rpi/noise.hpp b/src/ipa/raspberrypi/controller/rpi/noise.hpp\nindex 25bf188..37a22fd 100644\n--- a/src/ipa/raspberrypi/controller/rpi/noise.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/noise.hpp\n@@ -18,7 +18,8 @@ class Noise : public Algorithm\n public:\n \tNoise(Controller *controller);\n \tchar const *Name() const override;\n-\tvoid SwitchMode(CameraMode const &camera_mode, Metadata *metadata) override;\n+\tvoid SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\tMetadata *metadata) override;\n \tvoid Read(boost::property_tree::ptree const ¶ms) override;\n \tvoid Prepare(Metadata *image_metadata) override;\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\nindex 2b701db..64d269d 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\n@@ -26,7 +26,8 @@ char const *Sharpen::Name() const\n \treturn NAME;\n }\n \n-void Sharpen::SwitchMode(CameraMode const &camera_mode, Metadata *metadata)\n+void Sharpen::SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\t\t Metadata *metadata)\n {\n \t(void)metadata;\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\nindex 568521b..8a1c164 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\n@@ -18,7 +18,8 @@ class Sharpen : public SharpenAlgorithm\n public:\n \tSharpen(Controller *controller);\n \tchar const *Name() const override;\n-\tvoid SwitchMode(CameraMode const &camera_mode, Metadata *metadata) override;\n+\tvoid SwitchMode(CameraMode const &camera_mode, libcamera::Transform transform,\n+\t\t\t\t\tMetadata *metadata) override;\n \tvoid Read(boost::property_tree::ptree const ¶ms) override;\n \tvoid SetStrength(double strength) override;\n \tvoid Prepare(Metadata *image_metadata) override;\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 2809521..a8676fb 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -270,21 +270,6 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t\tagcStatus.analogue_gain = DEFAULT_ANALOGUE_GAIN;\n \t}\n \n-\tRPi::Metadata metadata;\n-\tcontroller_.SwitchMode(mode_, &metadata);\n-\n-\t/* SwitchMode may supply updated exposure/gain values to use. */\n-\tmetadata.Get(\"agc.status\", agcStatus);\n-\tif (agcStatus.shutter_time != 0.0 && agcStatus.analogue_gain != 0.0) {\n-\t\tControlList ctrls(unicam_ctrls_);\n-\t\tapplyAGC(&agcStatus, ctrls);\n-\t\tresult->controls.push_back(ctrls);\n-\n-\t\tresult->operation |= RPI_IPA_CONFIG_SENSOR;\n-\t}\n-\n-\tlastMode_ = mode_;\n-\n \t/* Store the lens shading table pointer and handle if available. */\n \tunsigned int next_element = 0;\n \tif (ipaConfig.operation & RPI_IPA_CONFIG_LS_TABLE) {\n@@ -312,6 +297,22 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t\tuint32_t transformType = ipaConfig.data[next_element++];\n \t\tuserTransform_ = reinterpret_cast(transformType);\n \t}\n+\n+\t/* Finally we can tell the IPAs about the new camera mode. */\n+\tRPi::Metadata metadata;\n+\tcontroller_.SwitchMode(mode_, userTransform_, &metadata);\n+\n+\t/* SwitchMode may supply updated exposure/gain values to use. */\n+\tmetadata.Get(\"agc.status\", agcStatus);\n+\tif (agcStatus.shutter_time != 0.0 && agcStatus.analogue_gain != 0.0) {\n+\t\tControlList ctrls(unicam_ctrls_);\n+\t\tapplyAGC(&agcStatus, ctrls);\n+\t\tresult->controls.push_back(ctrls);\n+\n+\t\tresult->operation |= RPI_IPA_CONFIG_SENSOR;\n+\t}\n+\n+\tlastMode_ = mode_;\n }\n \n void IPARPi::mapBuffers(const std::vector &buffers)\n","prefixes":["libcamera-devel","3/5"]}