{"id":11863,"url":"https://patchwork.libcamera.org/api/1.1/patches/11863/?format=json","web_url":"https://patchwork.libcamera.org/patch/11863/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210407160644.58326-4-jacopo@jmondi.org>","date":"2021-04-07T16:06:44","name":"[libcamera-devel,3/3] android: camera_device: Use controls::SensorTimestamp","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"56e0203518761a7356ebb35693f3bb8be019d95f","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11863/mbox/","series":[{"id":1902,"url":"https://patchwork.libcamera.org/api/1.1/series/1902/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1902","date":"2021-04-07T16:06:41","name":"libcamera: Add sensor timestamp support","version":1,"mbox":"https://patchwork.libcamera.org/series/1902/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11863/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11863/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 30C9DBD1F6\n\tfor ;\n\tWed, 7 Apr 2021 16:06:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AC847687E7;\n\tWed, 7 Apr 2021 18:06:17 +0200 (CEST)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 925FE687A1\n\tfor ;\n\tWed, 7 Apr 2021 18:06:15 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 05B63E0008;\n\tWed, 7 Apr 2021 16:06:14 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 7 Apr 2021 18:06:44 +0200","Message-Id":"<20210407160644.58326-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210407160644.58326-1-jacopo@jmondi.org>","References":"<20210407160644.58326-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 3/3] 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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use the controls::SensorTimestamp value to populate\nANDROID_SENSOR_TIMESTAMP result metadata, if the Camera provides\nit.\n\nUse the same control to notify the shutter even to the camera framework\notherwise fall-back to the timestamp of the first completed buffer\nif it is not available.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 33 ++++++++++++++++++++-------------\n src/android/camera_device.h | 3 +--\n 2 files changed, 21 insertions(+), 15 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 89044efa7ebe..749fe5c3dedc 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,19 @@ 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;\n+\n+\t\tif (request->metadata().contains(controls::SensorTimestamp)) {\n+\t\t\ttimestamp = request->metadata().get(controls::SensorTimestamp);\n+\t\t} else {\n+\t\t\t/*\n+\t\t\t * Use the timestamp from the first buffer (which may be\n+\t\t\t * the first stream) in the Request if the pipeline does\n+\t\t\t * not report the sensor timestamp.\n+\t\t\t */\n+\t\t\tconst Request::BufferMap &buffers = request->buffers();\n+\t\t\ttimestamp = buffers.begin()->second->metadata().timestamp;\n+\t\t}\n \t\tnotifyShutter(descriptor->frameNumber_, timestamp);\n \n \t\tcaptureResult.partial_result = 1;\n@@ -2147,8 +2152,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 +2278,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@@ -2314,6 +2316,11 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor,\n \t\t\t\t\t &exposure, 1);\n \t}\n \n+\tif (metadata.contains(controls::SensorTimestamp)) {\n+\t\tint64_t timestamp = metadata.get(controls::SensorTimestamp);\n+\t\tresultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, ×tamp, 1);\n+\t}\n+\n \tif (metadata.contains(controls::ScalerCrop)) {\n \t\tRectangle crop = metadata.get(controls::ScalerCrop);\n \t\tint32_t cropRect[] = {\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 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_;\n","prefixes":["libcamera-devel","3/3"]}