{"id":11332,"url":"https://patchwork.libcamera.org/api/patches/11332/?format=json","web_url":"https://patchwork.libcamera.org/patch/11332/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210218124824.1825418-3-naush@raspberrypi.com>","date":"2021-02-18T12:48:22","name":"[libcamera-devel,v3,2/4] pipeline: ipa: raspberrypi: Tidy-ups after IPAInterface changes","commit_ref":"22a33aa48feb31f654c1d06f14ea9a9d418f02a5","pull_url":null,"state":"accepted","archived":false,"hash":"62b4cfedeb5458570ec4f207697793fc4ece0f88","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11332/mbox/","series":[{"id":1706,"url":"https://patchwork.libcamera.org/api/series/1706/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1706","date":"2021-02-18T12:48:20","name":"Updates after IPAInterface changes","version":3,"mbox":"https://patchwork.libcamera.org/series/1706/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11332/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11332/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 7310CBD1F6\n\tfor ;\n\tThu, 18 Feb 2021 12:48:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 38C1B689BA;\n\tThu, 18 Feb 2021 13:48:37 +0100 (CET)","from mail-wr1-x431.google.com (mail-wr1-x431.google.com\n\t[IPv6:2a00:1450:4864:20::431])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 705366836F\n\tfor ;\n\tThu, 18 Feb 2021 13:48:34 +0100 (CET)","by mail-wr1-x431.google.com with SMTP id a4so617020wro.8\n\tfor ;\n\tThu, 18 Feb 2021 04:48:34 -0800 (PST)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:15:c37b:2722:9ed2:1d58])\n\tby smtp.gmail.com with ESMTPSA id\n\tz63sm7675876wme.8.2021.02.18.04.48.33\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 18 Feb 2021 04:48:33 -0800 (PST)"],"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=\"heWje3J7\"; 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=jCN620akcDzN1LauegtIxBd2MKYranhSb0eYGC8Zu7g=;\n\tb=heWje3J77xCsr4cJN+5C4UBuRCca9HBEiMfrn0B9PvDJcVILNlFH0tryeryDAB1lpn\n\tKTpAiV0jnzxaLUCYJqKtXzdyoQUo6Qsi6n1x8Rj2DCYB9e1J3KS7FMhUX5nypw2cdKZD\n\tecfgVojxhaWIdB4gWwLcF+IxbBPnXvuNuKJQqvC0+fCdX44FGugPdR/A0uWK7YQrO9RT\n\tYJTsWm1nKG8EGmXyKFvq5xnx8nwtZsXSMYfDftWKn8ddPSC7yw5AYPbZEjHMfU9UJqzL\n\t+/F0LGZUkKjxc9RbEjOOrzMMXg9JuZQsCfvhvRfuAtqvuiTyPCTg+OwSCYgVpPR8qevp\n\tuoNA==","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=jCN620akcDzN1LauegtIxBd2MKYranhSb0eYGC8Zu7g=;\n\tb=A1L19qazr1avHU8EeLGRVJgp1cxtYKrNkw3qf4lCYRkmqSp08FUrhjGw8r5WncZs2y\n\ta8y/P0+cDVtlQ/AFPWtIuqWPv8OyPl9TTDUgbimeijGvvbjiJDROGuSTT1WvoeHiknPX\n\tyAs7g/I+A3LziK08QjxLk1YflWiCQYbTmQpczO7elV2Hxf5DJatnM6M3UBu8yobx1ysG\n\t+24lRCrDFUzAjGRQ49uzFUVIvbor5hAo4acWd8vXn2f0Db3Lj8Aq6cPSoQeGTc5g8eId\n\t5MUp/Wbf0JhlBbStU10a5YMrZ8vj24DuNAXVAiq8wSqHguQRhjZ3dPACiQWylbs42a2r\n\tMkbg==","X-Gm-Message-State":"AOAM530X/xDtk25K+duswNeU38kHjbG/RVvjiSxjVqtuLo+oXgYDMVCV\n\tbBen9gdCeWXWiHp7hhcvPjzarjvfRxLPDsQp","X-Google-Smtp-Source":"ABdhPJx6htA1Iv0GBqEJju5JP1ZHeUatnAmppcHd2U8NOH5p4G0zf3XAlAQyOiSNug5KPW9Xq53gqA==","X-Received":"by 2002:adf:c6c1:: with SMTP id c1mr4209010wrh.326.1613652513793;\n\tThu, 18 Feb 2021 04:48:33 -0800 (PST)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 18 Feb 2021 12:48:22 +0000","Message-Id":"<20210218124824.1825418-3-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210218124824.1825418-1-naush@raspberrypi.com>","References":"<20210218124824.1825418-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 2/4] pipeline: ipa: raspberrypi:\n\tTidy-ups after IPAInterface changes","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 addresses a couple of tidy-ups after the IPAInterface\nrework:\n- Rename ConfigStaggeredWrite -> ConfigSensorParams\n- Rename setIsp -> setIspControls\n\nThere is no functional change in this commit.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: Paul Elder \nReviewed-by: Kieran Bingham \n---\n include/libcamera/ipa/raspberrypi.mojom | 8 ++++----\n src/ipa/raspberrypi/raspberrypi.cpp | 8 ++++----\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 12 ++++++------\n 3 files changed, 14 insertions(+), 14 deletions(-)","diff":"diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex bab19a946e18..9c05cc68cceb 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -16,7 +16,7 @@ enum BufferMask {\n const uint32 MaxLsGridSize = 0x8000;\n \n enum ConfigOutputParameters {\n-\tConfigStaggeredWrite = 0x01,\n+\tConfigSensorParams = 0x01,\n };\n \n struct SensorConfig {\n@@ -27,8 +27,8 @@ struct SensorConfig {\n };\n \n struct ISPConfig {\n-\tuint32 embeddedbufferId;\n-\tuint32 bayerbufferId;\n+\tuint32 embeddedBufferId;\n+\tuint32 bayerBufferId;\n };\n \n struct ConfigInput {\n@@ -126,6 +126,6 @@ interface IPARPiEventInterface {\n \tstatsMetadataComplete(uint32 bufferId, ControlList controls);\n \trunIsp(uint32 bufferId);\n \tembeddedComplete(uint32 bufferId);\n-\tsetIsp(ControlList controls);\n+\tsetIspControls(ControlList controls);\n \tsetDelayedControls(ControlList controls);\n };\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 81a3195c82e9..974f4ec63058 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -344,7 +344,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t\thelper_->GetDelays(exposureDelay, gainDelay);\n \t\tsensorMetadata = helper_->SensorEmbeddedDataPresent();\n \n-\t\tresult->params |= ipa::rpi::ConfigStaggeredWrite;\n+\t\tresult->params |= ipa::rpi::ConfigSensorParams;\n \t\tresult->sensorConfig.gainDelay = gainDelay;\n \t\tresult->sensorConfig.exposureDelay = exposureDelay;\n \t\tresult->sensorConfig.vblank = exposureDelay;\n@@ -447,11 +447,11 @@ void IPARPi::signalIspPrepare(const ipa::rpi::ISPConfig &data)\n \t * avoid running the control algos for a few frames in case\n \t * they are \"unreliable\".\n \t */\n-\tprepareISP(data.embeddedbufferId);\n+\tprepareISP(data.embeddedBufferId);\n \tframeCount_++;\n \n \t/* Ready to push the input buffer into the ISP. */\n-\trunIsp.emit(data.bayerbufferId & ipa::rpi::MaskID);\n+\trunIsp.emit(data.bayerBufferId & ipa::rpi::MaskID);\n }\n \n void IPARPi::reportMetadata()\n@@ -968,7 +968,7 @@ void IPARPi::prepareISP(unsigned int bufferId)\n \t\t\tapplyDPC(dpcStatus, ctrls);\n \n \t\tif (!ctrls.empty())\n-\t\t\tsetIsp.emit(ctrls);\n+\t\t\tsetIspControls.emit(ctrls);\n \t}\n }\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 75d57c2a2ffd..aac285b44748 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -152,7 +152,7 @@ public:\n \tvoid statsMetadataComplete(uint32_t bufferId, const ControlList &controls);\n \tvoid runIsp(uint32_t bufferId);\n \tvoid embeddedComplete(uint32_t bufferId);\n-\tvoid setIsp(const ControlList &controls);\n+\tvoid setIspControls(const ControlList &controls);\n \tvoid setDelayedControls(const ControlList &controls);\n \n \t/* bufferComplete signal handlers. */\n@@ -1172,7 +1172,7 @@ int RPiCameraData::loadIPA()\n \tipa_->statsMetadataComplete.connect(this, &RPiCameraData::statsMetadataComplete);\n \tipa_->runIsp.connect(this, &RPiCameraData::runIsp);\n \tipa_->embeddedComplete.connect(this, &RPiCameraData::embeddedComplete);\n-\tipa_->setIsp.connect(this, &RPiCameraData::setIsp);\n+\tipa_->setIspControls.connect(this, &RPiCameraData::setIspControls);\n \tipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls);\n \n \tIPASettings settings(ipa_->configurationFile(sensor_->model() + \".json\"));\n@@ -1241,7 +1241,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n \t\treturn -EPIPE;\n \t}\n \n-\tif (result.params & ipa::rpi::ConfigStaggeredWrite) {\n+\tif (result.params & ipa::rpi::ConfigSensorParams) {\n \t\t/*\n \t\t * Setup our delayed control writer with the sensor default\n \t\t * gain and exposure delays.\n@@ -1336,7 +1336,7 @@ void RPiCameraData::embeddedComplete(uint32_t bufferId)\n \thandleState();\n }\n \n-void RPiCameraData::setIsp(const ControlList &controls)\n+void RPiCameraData::setIspControls(const ControlList &controls)\n {\n \tControlList ctrls = controls;\n \n@@ -1692,8 +1692,8 @@ void RPiCameraData::tryRunPipeline()\n \t\t\t<< \" Embedded buffer id: \" << embeddedId;\n \n \tipa::rpi::ISPConfig ispPrepare;\n-\tispPrepare.embeddedbufferId = ipa::rpi::MaskEmbeddedData | embeddedId;\n-\tispPrepare.bayerbufferId = ipa::rpi::MaskBayerData | bayerId;\n+\tispPrepare.embeddedBufferId = ipa::rpi::MaskEmbeddedData | embeddedId;\n+\tispPrepare.bayerBufferId = ipa::rpi::MaskBayerData | bayerId;\n \tipa_->signalIspPrepare(ispPrepare);\n }\n \n","prefixes":["libcamera-devel","v3","2/4"]}