From patchwork Thu Apr 22 09:41:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12078 X-Patchwork-Delegate: paul.elder@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 53F2ABDB17 for ; Thu, 22 Apr 2021 09:41:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0FEE068871; Thu, 22 Apr 2021 11:41:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="FYYZ9zVk"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7B77C68873 for ; Thu, 22 Apr 2021 11:41:32 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1C0023EE; Thu, 22 Apr 2021 11:41:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1619084492; bh=gPz8fEnlfgcGENnZrqlXy3CU8jc3xyMPytdFpKkmHn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FYYZ9zVkAlyH0YBVaPwuGeDHaxCl2zwbQZxiu3xGc+F6vg8vgAUlPdGnl3XacXF2f sgYo8iOzoTwImrB6M5Q3zKUJRBa4NuLBfab6IKY7iCPpg3XPgpkVeOO8+VOMMBdRxz FKsMjpwElFPVwErZNQS4C1Karvse7metJeuo1HEI= 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 metadata for FULL compliance X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Set the request metadata as required by FULL hardware level. Signed-off-by: Paul Elder --- src/libcamera/pipeline/ipu3/ipu3.cpp | 67 ++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 70a5e9ce..de90b9fe 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -75,7 +75,8 @@ class IPU3CameraData : public CameraData { public: IPU3CameraData(PipelineHandler *pipe) - : CameraData(pipe), exposureTime_(0), supportsFlips_(false) + : CameraData(pipe), exposureTime_(0), supportsFlips_(false), + lastTimestamp_(0) { } @@ -106,6 +107,8 @@ public: private: void queueFrameAction(unsigned int id, const ipa::ipu3::IPU3Action &action); + + int64_t lastTimestamp_; }; class IPU3CameraConfiguration : public CameraConfiguration @@ -1249,12 +1252,65 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer) request->metadata().set(controls::draft::PipelineDepth, 3); /* \todo Move the ExposureTime control to the IPA. */ - request->metadata().set(controls::ExposureTime, exposureTime_); + request->metadata().set(controls::ExposureTime, + request->controls().contains(controls::ExposureTime) ? + request->controls().get(controls::ExposureTime) : + exposureTime_); /* \todo Actually apply the scaler crop region to the ImgU. */ if (request->controls().contains(controls::ScalerCrop)) cropRegion_ = request->controls().get(controls::ScalerCrop); request->metadata().set(controls::ScalerCrop, cropRegion_); + request->metadata().set(controls::draft::BlackLevelLocked, + request->controls().contains(controls::draft::BlackLevelLocked) ? + request->controls().get(controls::draft::BlackLevelLocked) : + false); + + request->metadata().set(controls::AeLocked, + request->controls().contains(controls::AeLocked) ? + request->controls().get(controls::AeLocked) : + false); + + request->metadata().set(controls::draft::AePrecaptureTrigger, + request->controls().contains(controls::draft::AePrecaptureTrigger) ? + request->controls().get(controls::draft::AePrecaptureTrigger) : + controls::draft::AePrecaptureTriggerIdle); + + request->metadata().set(controls::AwbMode, + request->controls().contains(controls::AwbMode) ? + request->controls().get(controls::AwbMode) : + controls::AwbAuto); + + request->metadata().set(controls::AwbLocked, + request->controls().contains(controls::AwbLocked) ? + request->controls().get(controls::AwbLocked) : + false); + + request->metadata().set(controls::draft::EdgeMode, + request->controls().contains(controls::draft::EdgeMode) ? + request->controls().get(controls::draft::EdgeMode) : + (uint8_t)controls::draft::EdgeModeOff); + + request->metadata().set(controls::draft::NoiseReductionMode, + request->controls().contains(controls::draft::NoiseReductionMode) ? + request->controls().get(controls::draft::NoiseReductionMode) : + controls::draft::NoiseReductionModeOff); + + request->metadata().set(controls::draft::SensorSensitivity, + request->controls().contains(controls::draft::SensorSensitivity) ? + request->controls().get(controls::draft::SensorSensitivity) : + 32); + + if (request->metadata().get(controls::draft::FrameDuration) < + request->metadata().get(controls::ExposureTime) * 1000) + request->metadata().set(controls::draft::FrameDuration, + request->metadata().get(controls::ExposureTime) * 1000); + + request->metadata().set(controls::draft::TonemapMode, + request->controls().contains(controls::draft::TonemapMode) ? + request->controls().get(controls::draft::TonemapMode) : + (uint8_t)controls::draft::TonemapModeFast); + if (frameInfos_.tryComplete(info)) pipe_->completeRequest(request); } @@ -1280,8 +1336,13 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer) * \todo The sensor timestamp should be better estimated by connecting * to the V4L2Device::frameStart signal. */ + int64_t timestamp = buffer->metadata().timestamp; request->metadata().set(controls::SensorTimestamp, - buffer->metadata().timestamp); + timestamp); + + request->metadata().set(controls::draft::FrameDuration, + timestamp - lastTimestamp_); + lastTimestamp_ = timestamp; /* If the buffer is cancelled force a complete of the whole request. */ if (buffer->metadata().status == FrameMetadata::FrameCancelled) {