From patchwork Fri May 21 10:55:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12338 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 8D07BC3200 for ; Fri, 21 May 2021 10:55:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2AC236891A; Fri, 21 May 2021 12:55:53 +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="NETZp6bY"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7737268911 for ; Fri, 21 May 2021 12:55:51 +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 E92278D8; Fri, 21 May 2021 12:55:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1621594551; bh=TkKi5r9iHIpC/4wqlPcsH4MgEsk6dUt2bcByAz7BgWE=; h=From:To:Cc:Subject:Date:From; b=NETZp6bYpYSDcNIIy9da3RPaXF3ekR+HjOdku/K6NFE7gcQHOqiVOGy0f/q9oSKSm 4VkFySMvplZ7WDkj4ubcZkrdQ3nk/JjMVfG2kJabIXgnIPzdaEmpM1DkI8CwMUMALY Fk9NLL1G9GC5qKJR/LKROrfjyI3uUDsq4q5M53cY= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 21 May 2021 19:55:33 +0900 Message-Id: <20210521105534.1125303-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] android: camera_device: Fix sensor frame duration 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" The sensor frame duration should be set by IPA. Get the information for the result metadata from libcamera. Signed-off-by: Paul Elder --- src/android/camera_device.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index b32e8be5..779ce554 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -2252,6 +2252,16 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons resultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME, exposure); } + if (metadata.contains(controls::FrameDurations)) { + Span durations = + metadata.get(controls::FrameDurations); + if (durations[0] == durations[1]) { + int64_t duration = durations[0] * 1000; + resultMetadata->addEntry(ANDROID_SENSOR_FRAME_DURATION, + duration); + } + } + if (metadata.contains(controls::ScalerCrop)) { Rectangle crop = metadata.get(controls::ScalerCrop); int32_t cropRect[] = { From patchwork Fri May 21 10:55:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12339 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 C70D7C3200 for ; Fri, 21 May 2021 10:55:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8A4E368920; Fri, 21 May 2021 12:55:54 +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="sE4uheH3"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5D4036891E for ; Fri, 21 May 2021 12:55:53 +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 BB41E8D8; Fri, 21 May 2021 12:55:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1621594553; bh=DamRyC60ejAgQjPsbXkmc6xthE98ttlY3ZhbF2w98mI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sE4uheH3AbG2HgBnIz8MqAX7R7rxdZ7cjRgbualoe2/jw9H1pUlQpXS32KDaBzEsI gjuHJMs3aqfk1o5LXAxqvgJEfVpBWLF3ZzmxYUzbZcVaERvcsAas1H6rTXVm5a+b+S 2VGHQwhj+vIPrBqp2XYIlxUfhI9MEdWnNa8kl60Y= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 21 May 2021 19:55:34 +0900 Message-Id: <20210521105534.1125303-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210521105534.1125303-1-paul.elder@ideasonboard.com> References: <20210521105534.1125303-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] ipa: ipu3: Set output frame duration metadata 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" The sensor frame duration should be set by the IPA. Hardcode it for now. Signed-off-by: Paul Elder Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda --- src/ipa/ipu3/ipu3.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index f5343547..35c24052 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -269,6 +269,10 @@ void IPAIPU3::parseStatistics(unsigned int frame, if (agcAlgo_->updateControls()) setControls(frame); + ctrls.set(controls::FrameDurations, + { static_cast(33334), + static_cast(33334) }); + IPU3Action op; op.op = ActionMetadataReady; op.controls = ctrls;