{"id":14603,"url":"https://patchwork.libcamera.org/api/patches/14603/?format=json","web_url":"https://patchwork.libcamera.org/patch/14603/","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":"<20211113084947.21892-14-jeanmichel.hautbois@ideasonboard.com>","date":"2021-11-13T08:49:46","name":"[libcamera-devel,v5,13/14] ipa: ipu3: Move ExposureTime to IPA","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8cbdadf39f3d1d608d90e17edc96128939181b07","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14603/mbox/","series":[{"id":2717,"url":"https://patchwork.libcamera.org/api/series/2717/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2717","date":"2021-11-13T08:49:33","name":"IPA: IPU3: Introduce per-frame controls","version":5,"mbox":"https://patchwork.libcamera.org/series/2717/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14603/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14603/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 B673AC324F\n\tfor ;\n\tSat, 13 Nov 2021 08:50:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5A56B6036C;\n\tSat, 13 Nov 2021 09:50:04 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 866AF60394\n\tfor ;\n\tSat, 13 Nov 2021 09:49:53 +0100 (CET)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:4d35:9445:6881:4ffd])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3D28A55C;\n\tSat, 13 Nov 2021 09:49:53 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"rEIr/ugD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1636793393;\n\tbh=QWekOye9ZV8IwyJ1PCC5qBnXNK+YkUVkIconh9+UD1Y=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rEIr/ugDOj7KgDSdG+0U1YLyvuXteoMo4LmZj7aISfw75d3Rr+8GtufrzXbB2jAFy\n\twVcnQ+Jv4U0sKl3/bjYGqa80eDXlfJVYqF5U2UUzMu9H+j4+cdfu1Ls3YDnyO3HzxR\n\tcAV42wYeUiHm71pFU9LX9BsoXeuNL8BFJ3lBqGgw=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 13 Nov 2021 09:49:46 +0100","Message-Id":"<20211113084947.21892-14-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211113084947.21892-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20211113084947.21892-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 13/14] ipa: ipu3: Move ExposureTime to\n\tIPA","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that we have the exposure time calculated, report it in the\ncontrols::ExposureTime and don't use the pipeline handler for it\nanymore.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \nReviewed-by: Umang Jain \nReviewed-by: Paul Elder \n---\n src/ipa/ipu3/ipu3.cpp | 2 ++\n src/libcamera/pipeline/ipu3/ipu3.cpp | 16 +---------------\n 2 files changed, 3 insertions(+), 15 deletions(-)","diff":"diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex f1597f78..dc6f2ced 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -630,6 +630,8 @@ void IPAIPU3::parseStatistics(unsigned int frame,\n \n \tctrls.set(controls::ColourTemperature, context_.frameContext.awb.temperatureK);\n \n+\tctrls.set(controls::ExposureTime, context_.frameContext.sensor.exposure * lineDuration_.get());\n+\n \t/*\n \t * \\todo The Metadata provides a path to getting extended data\n \t * out to the application. Further data such as a simplifed Histogram\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex c984ed12..319bb1a3 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -47,7 +47,7 @@ class IPU3CameraData : public Camera::Private\n {\n public:\n \tIPU3CameraData(PipelineHandler *pipe)\n-\t\t: Camera::Private(pipe), exposureTime_(0), supportsFlips_(false)\n+\t\t: Camera::Private(pipe), supportsFlips_(false)\n \t{\n \t}\n \n@@ -67,7 +67,6 @@ public:\n \tStream vfStream_;\n \tStream rawStream_;\n \n-\tuint32_t exposureTime_;\n \tRectangle cropRegion_;\n \tbool supportsFlips_;\n \tTransform rotationTransform_;\n@@ -1045,17 +1044,6 @@ int PipelineHandlerIPU3::updateControls(IPU3CameraData *data)\n \n \tcontrols[&controls::ScalerCrop] = ControlInfo(minCrop, maxCrop, maxCrop);\n \n-\t/*\n-\t * \\todo Report the actual exposure time, use the default for the\n-\t * moment.\n-\t */\n-\tconst auto exposureInfo = data->ipaControls_.find(&controls::ExposureTime);\n-\tif (exposureInfo == data->ipaControls_.end()) {\n-\t\tLOG(IPU3, Error) << \"Exposure control not initialized by the IPA\";\n-\t\treturn -EINVAL;\n-\t}\n-\tdata->exposureTime_ = exposureInfo->second.def().get();\n-\n \t/* Add the IPA registered controls to list of camera controls. */\n \tfor (const auto &ipaControl : data->ipaControls_)\n \t\tcontrols[ipaControl.first] = ipaControl.second;\n@@ -1317,8 +1305,6 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \tpipe()->completeBuffer(request, buffer);\n \n \trequest->metadata().set(controls::draft::PipelineDepth, 3);\n-\t/* \\todo Move the ExposureTime control to the IPA. */\n-\trequest->metadata().set(controls::ExposureTime, exposureTime_);\n \t/* \\todo Actually apply the scaler crop region to the ImgU. */\n \tif (request->controls().contains(controls::ScalerCrop))\n \t\tcropRegion_ = request->controls().get(controls::ScalerCrop);\n","prefixes":["libcamera-devel","v5","13/14"]}