[{"id":14668,"web_url":"https://patchwork.libcamera.org/comment/14668/","msgid":"","date":"2021-01-21T21:29:22","subject":"Re: [libcamera-devel] [PATCH v2 9/9] android: camera_device: Cache\n\trequest metadata","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Thu, Jan 21, 2021 at 07:15:49PM +0900, Paul Elder wrote:\n> The settings in an android capture request may be null, in which case\n> the settings from the most recently submitted capture request should be\n> used. Cache the request settings to achieve this.\n> \n> Signed-off-by: Paul Elder \n> \n> ---\n> New in v2\n> ---\n> src/android/camera_device.cpp | 10 ++++++----\n> src/android/camera_device.h | 2 ++\n> 2 files changed, 8 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 1b803c92..4f92cecc 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -337,7 +337,9 @@ CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n> \n> CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr &camera)\n> \t: id_(id), running_(false), camera_(camera), staticMetadata_(nullptr),\n> -\t facing_(CAMERA_FACING_FRONT), orientation_(0)\n> +\t facing_(CAMERA_FACING_FRONT), orientation_(0),\n> +\t /* \\todo Keep this in sync with the actual number of entries. */\n> +\t lastSettings_(CameraMetadata(40, 163))\n\nI think you can construct an empty CameraMetadata to start with, as the\nfirst request is guaranteed to have non-null settings.\n\n> {\n> \tcamera_->requestCompleted.connect(this, &CameraDevice::requestComplete);\n> \n> @@ -1692,12 +1694,12 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t * The descriptor and the associated memory reserved here are freed\n> \t * at request complete time.\n> \t */\n> -\t/* \\todo Handle null request settings */\n> -\tCameraMetadata settings(camera3Request->settings);\n> +\tif (camera3Request->settings)\n> +\t\tlastSettings_ = CameraMetadata(camera3Request->settings);\n> \tCamera3RequestDescriptor *descriptor =\n> \t\tnew Camera3RequestDescriptor(camera_.get(), camera3Request->frame_number,\n> \t\t\t\t\t camera3Request->num_output_buffers,\n> -\t\t\t\t\t settings);\n> +\t\t\t\t\t lastSettings_);\n\nI wonder if this should be moved to the beginning of this series. If it\ncauses too painful rebase conflicts we could leave it here.\n\n> \n> \tLOG(HAL, Debug) << \"Queueing Request to libcamera with \"\n> \t\t\t<< descriptor->numBuffers_ << \" HAL streams\";\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 111a7d8f..d3a9f777 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -139,6 +139,8 @@ private:\n> \tint orientation_;\n> \n> \tunsigned int maxJpegBufferSize_;\n> +\n> +\tCameraMetadata lastSettings_;\n> };\n> \n> #endif /* __ANDROID_CAMERA_DEVICE_H__ */","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 EE701C0F2A\n\tfor ;\n\tThu, 21 Jan 2021 21:29:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 827B768216;\n\tThu, 21 Jan 2021 22:29:42 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E5DC68204\n\tfor ;\n\tThu, 21 Jan 2021 22:29:41 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 698B550E;\n\tThu, 21 Jan 2021 22:29:40 +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=\"X0iOImza\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611264580;\n\tbh=EFZhDmfFGGXRbF34M922vioSfNxWOoXysr4u/QGfq78=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=X0iOImzauxRN+qTX2qp4hizpaDa5br/u5ZKZ5IAYIKNuGHSESkwNGhYyIuFo+5G7K\n\twbSP04K/lLO2XcY+eZs1Xb43MQQ7yWqTLfy/YqjwtRK/sSH2Z79OZGkW8HulSHiBb6\n\tvCyyV01f6O8b+P7Yzy2ieMQH9XOVGeWHxaUPmcpw=","Date":"Thu, 21 Jan 2021 23:29:22 +0200","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210121101549.134574-1-paul.elder@ideasonboard.com>\n\t<20210121101549.134574-10-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210121101549.134574-10-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 9/9] android: camera_device: Cache\n\trequest metadata","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]