Patch Detail
Show a patch.
GET /api/1.1/patches/12185/?format=api
{ "id": 12185, "url": "https://patchwork.libcamera.org/api/1.1/patches/12185/?format=api", "web_url": "https://patchwork.libcamera.org/patch/12185/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210503104152.34048-18-jacopo@jmondi.org>", "date": "2021-05-03T10:41:52", "name": "[libcamera-devel,v5,17/17] android: camera_device: Use controls::SensorTimestamp", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2fac0bf046383dc80426c34d60a98ffcd1dbed47", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/12185/mbox/", "series": [ { "id": 1994, "url": "https://patchwork.libcamera.org/api/1.1/series/1994/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1994", "date": "2021-05-03T10:41:35", "name": "Support SensorTimestamp metadata", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1994/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/12185/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/12185/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 6757BBDE78\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 3 May 2021 10:41:23 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C86C468945;\n\tMon, 3 May 2021 12:41:22 +0200 (CEST)", "from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2170368932\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 3 May 2021 12:41:18 +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 relay9-d.mail.gandi.net (Postfix) with ESMTPSA id CF494FF802\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 3 May 2021 10:41:17 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 3 May 2021 12:41:52 +0200", "Message-Id": "<20210503104152.34048-18-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210503104152.34048-1-jacopo@jmondi.org>", "References": "<20210503104152.34048-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v5 17/17] android: camera_device: Use\n\tcontrols::SensorTimestamp", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Use the controls::SensorTimestamp value to populate\nANDROID_SENSOR_TIMESTAMP result metadata.\n\nThe Camera is assumed to provide the control in the Request metadata.\n\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 21 ++++++++-------------\n src/android/camera_device.h | 3 +--\n 2 files changed, 9 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a71aee2fc734..f1f26c775611 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -2025,7 +2025,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<CameraMetadata> resultMetadata;\n \n@@ -2053,14 +2052,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@@ -2105,6 +2097,9 @@ void CameraDevice::requestComplete(Request *request)\n \tcaptureResult.output_buffers = descriptor.buffers_.data();\n \n \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n+\t\tuint64_t timestamp =\n+\t\t\tstatic_cast<uint64_t>(request->metadata()\n+\t\t\t\t\t .get(controls::SensorTimestamp));\n \t\tnotifyShutter(descriptor.frameNumber_, timestamp);\n \n \t\tcaptureResult.partial_result = 1;\n@@ -2164,8 +2159,7 @@ void CameraDevice::notifyError(uint32_t frameNumber, camera3_stream_t *stream)\n * Produce a set of fixed result metadata.\n */\n std::unique_ptr<CameraMetadata>\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@@ -2291,8 +2285,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@@ -2318,6 +2310,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+\tconst int64_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<int32_t>(controls::draft::PipelineDepth);\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex c63e8e21726e..23457e47767a 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -107,8 +107,7 @@ private:\n \tlibcamera::PixelFormat toPixelFormat(int format) const;\n \tint processControls(Camera3RequestDescriptor *descriptor);\n \tstd::unique_ptr<CameraMetadata> 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", "v5", "17/17" ] }