[{"id":16412,"web_url":"https://patchwork.libcamera.org/comment/16412/","msgid":"","date":"2021-04-20T22:00:38","subject":"Re: [libcamera-devel] [PATCH 13/13] android: camera_device: Use\n\tcontrols::SensorTimestamp","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Mon, Apr 19, 2021 at 03:14:33PM +0200, Jacopo Mondi wrote:\n> Use the controls::SensorTimestamp value to populate\n> ANDROID_SENSOR_TIMESTAMP result metadata.\n> \n> The Camera is assumed to provide the control in the Request metadata.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/android/camera_device.cpp | 19 ++++++-------------\n> src/android/camera_device.h | 3 +--\n> 2 files changed, 7 insertions(+), 15 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 89044efa7ebe..3d1e4bc3bff5 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -2019,7 +2019,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \n> void CameraDevice::requestComplete(Request *request)\n> {\n> -\tconst Request::BufferMap &buffers = request->buffers();\n> \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n> \tstd::unique_ptr resultMetadata;\n> \tCamera3RequestDescriptor *descriptor =\n> @@ -2034,14 +2033,7 @@ void CameraDevice::requestComplete(Request *request)\n> \tLOG(HAL, Debug) << \"Request \" << request->cookie() << \" completed with \"\n> \t\t\t<< descriptor->buffers_.size() << \" streams\";\n> \n> -\t/*\n> -\t * \\todo The timestamp used for the metadata is currently always taken\n> -\t * from the first buffer (which may be the first stream) in the Request.\n> -\t * It might be appropriate to return a 'correct' (as determined by\n> -\t * pipeline handlers) timestamp in the Request itself.\n> -\t */\n> -\tuint64_t timestamp = buffers.begin()->second->metadata().timestamp;\n> -\tresultMetadata = getResultMetadata(*descriptor, timestamp);\n> +\tresultMetadata = getResultMetadata(*descriptor);\n> \n> \t/* Handle any JPEG compression. */\n> \tfor (camera3_stream_buffer_t &buffer : descriptor->buffers_) {\n> @@ -2086,6 +2078,7 @@ void CameraDevice::requestComplete(Request *request)\n> \tcaptureResult.output_buffers = descriptor->buffers_.data();\n> \n> \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n> +\t\tint64_t timestamp = request->metadata().get(controls::SensorTimestamp);\n> \t\tnotifyShutter(descriptor->frameNumber_, timestamp);\n> \n> \t\tcaptureResult.partial_result = 1;\n> @@ -2147,8 +2140,7 @@ void CameraDevice::notifyError(uint32_t frameNumber, camera3_stream_t *stream)\n> * Produce a set of fixed result metadata.\n> */\n> std::unique_ptr\n> -CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor,\n> -\t\t\t\tint64_t timestamp) const\n> +CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) const\n> {\n> \tconst ControlList &metadata = descriptor.request_->metadata();\n> \tconst CameraMetadata &settings = descriptor.settings_;\n> @@ -2274,8 +2266,6 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor,\n> \tresultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE,\n> \t\t\t\t &value32, 1);\n> \n> -\tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, ×tamp, 1);\n> -\n> \tvalue = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> \tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n> \t\t\t\t &value, 1);\n> @@ -2301,6 +2291,9 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor,\n> \t\t\t\t &rolling_shutter_skew, 1);\n> \n> \t/* Add metadata tags reported by libcamera. */\n> +\tint64_t timestamp = metadata.get(controls::SensorTimestamp);\n> +\tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, ×tamp, 1);\n> +\n> \tif (metadata.contains(controls::draft::PipelineDepth)) {\n> \t\tuint8_t pipeline_depth =\n> \t\t\tmetadata.get(controls::draft::PipelineDepth);\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 11bdfec8d587..73e5009ac274 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -102,8 +102,7 @@ private:\n> \tlibcamera::PixelFormat toPixelFormat(int format) const;\n> \tint processControls(Camera3RequestDescriptor *descriptor);\n> \tstd::unique_ptr getResultMetadata(\n> -\t\tconst Camera3RequestDescriptor &descriptor,\n> -\t\tint64_t timestamp) const;\n> +\t\tconst Camera3RequestDescriptor &descriptor) const;\n> \n> \tunsigned int id_;\n> \tcamera3_device_t camera3Device_;","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 7F610BDB15\n\tfor ;\n\tTue, 20 Apr 2021 22:00:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 650CA68843;\n\tWed, 21 Apr 2021 00:00:45 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 14E66602C8\n\tfor ;\n\tWed, 21 Apr 2021 00:00:43 +0200 (CEST)","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 7F42B45E;\n\tWed, 21 Apr 2021 00:00:42 +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=\"oxrBOt1E\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618956042;\n\tbh=Ojv/jOjQneE/368rSFbZLEZlGO0ud+c2ozK7dSGYFaE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=oxrBOt1EyzHkkBHftI65Um8SQhvz9IfuTxoLzLAu4g1FsJuG8LFmpqgZh4gBryJzy\n\tgj2mk8ShyRl6zZCfigBX25RfKkH9mxOakMc61K2wXCvD71xHhbQlFupxBjCXC5GZ2a\n\tlnMY2n5K99Kj9SnwVWgtkB5Mss7Yrxk0Tu2yQU/c=","Date":"Wed, 21 Apr 2021 01:00:38 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210419131433.22920-1-jacopo@jmondi.org>\n\t<20210419131433.22920-14-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210419131433.22920-14-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 13/13] android: camera_device: Use\n\tcontrols::SensorTimestamp","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\" "}}]