{"id":9238,"url":"https://patchwork.libcamera.org/api/patches/9238/?format=json","web_url":"https://patchwork.libcamera.org/patch/9238/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200805151507.227503-12-kieran.bingham@ideasonboard.com>","date":"2020-08-05T15:15:05","name":"[libcamera-devel,v4,11/13] android: camera_device: Generate ResultMetadata earlier","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0189d883f97e7d92db24a08523f9d5fd1abf067f","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9238/mbox/","series":[{"id":1198,"url":"https://patchwork.libcamera.org/api/series/1198/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1198","date":"2020-08-05T15:14:54","name":"android: JPEG support","version":4,"mbox":"https://patchwork.libcamera.org/series/1198/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9238/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9238/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 A84DFBD87A\n\tfor ;\n\tWed, 5 Aug 2020 15:15:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 721BA60822;\n\tWed, 5 Aug 2020 17:15:20 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E5D2460392\n\tfor ;\n\tWed, 5 Aug 2020 17:15:16 +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 6C88DFD1;\n\tWed, 5 Aug 2020 17:15:16 +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=\"U3bMjyk6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596640516;\n\tbh=uU9j6xuLlGvVO0swIxkQsGpz3Ve+CqHUKQQX3Ek9C84=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=U3bMjyk6oRkRPR5MMWhqpAIqJ1YIEh7OAqYyoQ5m+oCRWwPtKiOwLu+vIDVu0SLzZ\n\tlHGk1gZgaT/CjldGux+JmPQ2Ml8HA29JslXUnbUMlD+yFMxzhQRo8INHprRjo4FKJv\n\tdZ4ou2nkkEcH8y6JqqFwWFl5UbJq4yWadRC/yPsc=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 5 Aug 2020 16:15:05 +0100","Message-Id":"<20200805151507.227503-12-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200805151507.227503-1-kieran.bingham@ideasonboard.com>","References":"<20200805151507.227503-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 11/13] android: camera_device: Generate\n\tResultMetadata earlier","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":"Generate the ResultMetadata before performing JPEG compression so that\nJPEG specific metadata can be added to the metadata when it has been\nprocessed.\n\nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \nSigned-off-by: Kieran Bingham \n---\n src/android/camera_device.cpp | 23 ++++++++++++-----------\n 1 file changed, 12 insertions(+), 11 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 397161a9ab12..23db5f830a71 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1234,6 +1234,8 @@ void CameraDevice::requestComplete(Request *request)\n \tconst std::map &buffers = request->buffers();\n \tcamera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK;\n \tstd::unique_ptr resultMetadata;\n+\tCamera3RequestDescriptor *descriptor =\n+\t\treinterpret_cast(request->cookie());\n \n \tif (request->status() != Request::RequestComplete) {\n \t\tLOG(HAL, Error) << \"Request not successfully completed: \"\n@@ -1241,9 +1243,17 @@ 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(request->cookie());\n \n \tcamera3_capture_result_t captureResult = {};\n \tcaptureResult.frame_number = descriptor->frameNumber;\n@@ -1256,21 +1266,12 @@ void CameraDevice::requestComplete(Request *request)\n \tcaptureResult.output_buffers =\n \t\tconst_cast(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 \t\tcaptureResult.result = resultMetadata->get();\n \t}\n \n","prefixes":["libcamera-devel","v4","11/13"]}