{"id":12078,"url":"https://patchwork.libcamera.org/api/patches/12078/?format=json","web_url":"https://patchwork.libcamera.org/patch/12078/","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":"<20210422094102.371772-12-paul.elder@ideasonboard.com>","date":"2021-04-22T09:41:01","name":"[libcamera-devel,RFC,v2,11/12] pipeline: ipu3: Set request metadata for FULL compliance","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0cd23094483440a07eca0f1c598e39fae3e7d9d7","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/12078/mbox/","series":[{"id":1962,"url":"https://patchwork.libcamera.org/api/series/1962/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1962","date":"2021-04-22T09:40:50","name":"FULL hardware level fixes","version":2,"mbox":"https://patchwork.libcamera.org/series/1962/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12078/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12078/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 53F2ABDB17\n\tfor ;\n\tThu, 22 Apr 2021 09:41:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0FEE068871;\n\tThu, 22 Apr 2021 11:41:35 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7B77C68873\n\tfor ;\n\tThu, 22 Apr 2021 11:41:32 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1C0023EE;\n\tThu, 22 Apr 2021 11:41:30 +0200 (CEST)"],"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=\"FYYZ9zVk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619084492;\n\tbh=gPz8fEnlfgcGENnZrqlXy3CU8jc3xyMPytdFpKkmHn8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=FYYZ9zVkAlyH0YBVaPwuGeDHaxCl2zwbQZxiu3xGc+F6vg8vgAUlPdGnl3XacXF2f\n\tsgYo8iOzoTwImrB6M5Q3zKUJRBa4NuLBfab6IKY7iCPpg3XPgpkVeOO8+VOMMBdRxz\n\tFKsMjpwElFPVwErZNQS4C1Karvse7metJeuo1HEI=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 22 Apr 2021 18:41:01 +0900","Message-Id":"<20210422094102.371772-12-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210422094102.371772-1-paul.elder@ideasonboard.com>","References":"<20210422094102.371772-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [RFC PATCH v2 11/12] pipeline: ipu3: Set request\n\tmetadata for FULL compliance","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":"Set the request metadata as required by FULL hardware level.\n\nSigned-off-by: Paul Elder \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 67 ++++++++++++++++++++++++++--\n 1 file changed, 64 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 70a5e9ce..de90b9fe 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -75,7 +75,8 @@ class IPU3CameraData : public CameraData\n {\n public:\n \tIPU3CameraData(PipelineHandler *pipe)\n-\t\t: CameraData(pipe), exposureTime_(0), supportsFlips_(false)\n+\t\t: CameraData(pipe), exposureTime_(0), supportsFlips_(false),\n+\t\t lastTimestamp_(0)\n \t{\n \t}\n \n@@ -106,6 +107,8 @@ public:\n private:\n \tvoid queueFrameAction(unsigned int id,\n \t\t\t const ipa::ipu3::IPU3Action &action);\n+\n+\tint64_t lastTimestamp_;\n };\n \n class IPU3CameraConfiguration : public CameraConfiguration\n@@ -1249,12 +1252,65 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *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+\trequest->metadata().set(controls::ExposureTime,\n+\t\t\t\trequest->controls().contains(controls::ExposureTime) ?\n+\t\t\t\trequest->controls().get(controls::ExposureTime) :\n+\t\t\t\texposureTime_);\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 \trequest->metadata().set(controls::ScalerCrop, cropRegion_);\n \n+\trequest->metadata().set(controls::draft::BlackLevelLocked,\n+\t\t\t\trequest->controls().contains(controls::draft::BlackLevelLocked) ?\n+\t\t\t request->controls().get(controls::draft::BlackLevelLocked) :\n+\t\t\t\tfalse);\n+\n+\trequest->metadata().set(controls::AeLocked,\n+\t\t\t\trequest->controls().contains(controls::AeLocked) ?\n+\t\t\t\trequest->controls().get(controls::AeLocked) :\n+\t\t\t\tfalse);\n+\n+\trequest->metadata().set(controls::draft::AePrecaptureTrigger,\n+\t\t\t\trequest->controls().contains(controls::draft::AePrecaptureTrigger) ?\n+\t\t\t\trequest->controls().get(controls::draft::AePrecaptureTrigger) :\n+\t\t\t\tcontrols::draft::AePrecaptureTriggerIdle);\n+\n+\trequest->metadata().set(controls::AwbMode,\n+\t\t\t\trequest->controls().contains(controls::AwbMode) ?\n+\t\t\t\trequest->controls().get(controls::AwbMode) :\n+\t\t\t\tcontrols::AwbAuto);\n+\n+\trequest->metadata().set(controls::AwbLocked,\n+\t\t\t\trequest->controls().contains(controls::AwbLocked) ?\n+\t\t\t\trequest->controls().get(controls::AwbLocked) :\n+\t\t\t\tfalse);\n+\n+\trequest->metadata().set(controls::draft::EdgeMode,\n+\t\t\t\trequest->controls().contains(controls::draft::EdgeMode) ?\n+\t\t\t\trequest->controls().get(controls::draft::EdgeMode) :\n+\t\t\t\t(uint8_t)controls::draft::EdgeModeOff);\n+\n+\trequest->metadata().set(controls::draft::NoiseReductionMode,\n+\t\t\t\trequest->controls().contains(controls::draft::NoiseReductionMode) ?\n+\t\t\t\trequest->controls().get(controls::draft::NoiseReductionMode) :\n+\t\t\t\tcontrols::draft::NoiseReductionModeOff);\n+\n+\trequest->metadata().set(controls::draft::SensorSensitivity,\n+\t\t\t\trequest->controls().contains(controls::draft::SensorSensitivity) ?\n+\t\t\t\trequest->controls().get(controls::draft::SensorSensitivity) :\n+\t\t\t\t32);\n+\n+\tif (request->metadata().get(controls::draft::FrameDuration) <\n+\t request->metadata().get(controls::ExposureTime) * 1000)\n+\t\t\trequest->metadata().set(controls::draft::FrameDuration,\n+\t\t\t\t\t\trequest->metadata().get(controls::ExposureTime) * 1000);\n+\n+\trequest->metadata().set(controls::draft::TonemapMode,\n+\t\t\t\trequest->controls().contains(controls::draft::TonemapMode) ?\n+\t\t\t\trequest->controls().get(controls::draft::TonemapMode) :\n+\t\t\t\t(uint8_t)controls::draft::TonemapModeFast);\n+\n \tif (frameInfos_.tryComplete(info))\n \t\tpipe_->completeRequest(request);\n }\n@@ -1280,8 +1336,13 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \t * \\todo The sensor timestamp should be better estimated by connecting\n \t * to the V4L2Device::frameStart signal.\n \t */\n+\tint64_t timestamp = buffer->metadata().timestamp;\n \trequest->metadata().set(controls::SensorTimestamp,\n-\t\t\t\tbuffer->metadata().timestamp);\n+\t\t\t\ttimestamp);\n+\n+\trequest->metadata().set(controls::draft::FrameDuration,\n+\t\t\t\ttimestamp - lastTimestamp_);\n+\tlastTimestamp_ = timestamp;\n \n \t/* If the buffer is cancelled force a complete of the whole request. */\n \tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n","prefixes":["libcamera-devel","RFC","v2","11/12"]}