Patch Detail
Show a patch.
GET /api/patches/9150/?format=api
{ "id": 9150, "url": "https://patchwork.libcamera.org/api/patches/9150/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9150/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20200803161816.107113-11-kieran.bingham@ideasonboard.com>", "date": "2020-08-03T16:18:14", "name": "[libcamera-devel,v2,10/12] android: camera_device: Generate ResultMetadata earlier", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4ab3a422c1c85da724b9f5b07c307fef351ee449", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9150/mbox/", "series": [ { "id": 1183, "url": "https://patchwork.libcamera.org/api/series/1183/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1183", "date": "2020-08-03T16:18:04", "name": "android: jpeg", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1183/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9150/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9150/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 39148BD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 3 Aug 2020 16:18:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 03450619F4;\n\tMon, 3 Aug 2020 18:18:30 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 94035619AC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 3 Aug 2020 18:18:26 +0200 (CEST)", "from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 22DDD10C6;\n\tMon, 3 Aug 2020 18:18:26 +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=\"rg/Cx51Q\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596471506;\n\tbh=6JrzFw6nTgUeS+IVcb2v4uvk0DtjTPuS0ERzxli3sRg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rg/Cx51Qke0+wyzwAgYS++Ani/w5nrH0rH5/WY8iZyqjl53ueg7zm/zz69S1uS/LX\n\t30FegSfmIja35SLn5ZO6GjUTUtUd+7JFxJWigAPhWwqHEIOiaVv6D6OKXIYmuDBX/Z\n\twKieiOOEs6i2z2CHLiR+fETthcd4ak5O6VxlYip4=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Mon, 3 Aug 2020 17:18:14 +0100", "Message-Id": "<20200803161816.107113-11-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200803161816.107113-1-kieran.bingham@ideasonboard.com>", "References": "<20200803161816.107113-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 10/12] android: camera_device: Generate\n\tResultMetadata earlier", "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=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Generate the ResultMetadata before performing JPEG compression so that\nJPEG specific metadata can be added to the metadata when it has been\nprocessed.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/android/camera_device.cpp | 25 ++++++++++++++-----------\n 1 file changed, 14 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex ae52a5ca8b86..e23ab055d012 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1138,6 +1138,8 @@ void CameraDevice::requestComplete(Request *request)\n \tconst std::map<Stream *, FrameBuffer *> &buffers = request->buffers();\n \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n \tstd::unique_ptr<CameraMetadata> resultMetadata;\n+\tCamera3RequestDescriptor *descriptor =\n+\t\treinterpret_cast<Camera3RequestDescriptor *>(request->cookie());\n \n \tif (request->status() != Request::RequestComplete) {\n \t\tLOG(HAL, Error) << \"Request not successfully completed: \"\n@@ -1145,9 +1147,18 @@ void CameraDevice::requestComplete(Request *request)\n \t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n \t}\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+\tFrameBuffer *buffer = buffers.begin()->second;\n+\tresultMetadata = getResultMetadata(descriptor->frameNumber,\n+\t\t\t\t\t buffer->metadata().timestamp);\n+\n \t/* Prepare to call back the Android camera stack. */\n-\tCamera3RequestDescriptor *descriptor =\n-\t\treinterpret_cast<Camera3RequestDescriptor *>(request->cookie());\n+\n \n \tcamera3_capture_result_t captureResult = {};\n \tcaptureResult.frame_number = descriptor->frameNumber;\n@@ -1160,21 +1171,13 @@ void CameraDevice::requestComplete(Request *request)\n \tcaptureResult.output_buffers =\n \t\tconst_cast<const camera3_stream_buffer_t *>(descriptor->buffers);\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-\tFrameBuffer *buffer = buffers.begin()->second;\n \n \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n \t\tnotifyShutter(descriptor->frameNumber,\n \t\t\t buffer->metadata().timestamp);\n \n \t\tcaptureResult.partial_result = 1;\n-\t\tresultMetadata = getResultMetadata(descriptor->frameNumber,\n-\t\t\t\t\t\t buffer->metadata().timestamp);\n+\n \t\tcaptureResult.result = resultMetadata->get();\n \t}\n \n", "prefixes": [ "libcamera-devel", "v2", "10/12" ] }