{"id":13754,"url":"https://patchwork.libcamera.org/api/1.1/patches/13754/?format=json","web_url":"https://patchwork.libcamera.org/patch/13754/","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":"<20210907195704.338079-6-umang.jain@ideasonboard.com>","date":"2021-09-07T19:57:03","name":"[libcamera-devel,v1,5/6] android: camera_device: Move buffer mapping for post-processing","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"860cbac2c2b38cd995fde87cf67883af1621ec86","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/1.1/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/1.1/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/13754/mbox/","series":[{"id":2493,"url":"https://patchwork.libcamera.org/api/1.1/series/2493/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2493","date":"2021-09-07T19:56:58","name":"Async post-processor","version":1,"mbox":"https://patchwork.libcamera.org/series/2493/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13754/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13754/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 083B0BDC71\n\tfor ;\n\tTue, 7 Sep 2021 19:57:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BE4E56916D;\n\tTue, 7 Sep 2021 21:57: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 C1E8C60251\n\tfor ;\n\tTue, 7 Sep 2021 21:57:28 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.2])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A92DE499;\n\tTue, 7 Sep 2021 21:57:27 +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=\"ZlP4LIbM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631044648;\n\tbh=PFpwrkJ/ZQlOblUyt/bDW1RxI2/xWFWSUbL08yj5qUA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ZlP4LIbMR1+3VtPs1ehmvcd1GWy+MYwP0GK651KXGPf4lg6ytRGZpqXNqL8ThPq/F\n\tF9KhJIlEMEQaav3aKNo2OhaOT4rCaJTE4jvIfI7utA5/nXXdGvcDlRdO9ovG+OBn1G\n\ttPe1L/g/Ky87uYH++jAQ6ya1vbyAFJDKQl+TNgNE=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 8 Sep 2021 01:27:03 +0530","Message-Id":"<20210907195704.338079-6-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210907195704.338079-1-umang.jain@ideasonboard.com>","References":"<20210907195704.338079-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v1 5/6] android: camera_device: Move\n\tbuffer mapping for post-processing","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Buffer mapping currently happens in CameraStream::process() for\npost-processing. However, it can be easily be moved to CameraDevice\njust before the call to CameraStream::process(). The reason to do so\nis that we can hold the mapped destination buffer pointer as a part\nof Camera3RequestDescriptor. The Camera3RequestDescriptor already\nsaves other post-processing related context, to enable async post\nprocessing.\n\nSigned-off-by: Umang Jain \n---\n src/android/camera_device.cpp | 20 +++++++++++++++++++-\n src/android/camera_device.h | 1 +\n src/android/camera_stream.cpp | 16 ++--------------\n src/android/camera_stream.h | 2 +-\n 4 files changed, 23 insertions(+), 16 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 9d4ec02e..8741678d 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1162,6 +1162,17 @@ void CameraDevice::requestComplete(Request *request)\n \t\tdescriptor.resultMetadata_ = std::move(resultMetadata);\n \t\tdescriptor.captureResult_ = captureResult;\n \n+\t\t/* \\todo Buffer mapping should be moved to a separate thread? */\n+\t\tconst StreamConfiguration &output = cameraStream->configuration();\n+\t\tdescriptor.destBuffer_ = std::make_unique(*buffer.buffer,\n+\t\t\t\t\t\t\t\t\tformats::MJPEG,\n+\t\t\t\t\t\t\t\t\toutput.size,\n+\t\t\t\t\t\t\t\t\tPROT_READ | PROT_WRITE);\n+\t\tif (!descriptor.destBuffer_->isValid()) {\n+\t\t\tLOG(HAL, Error) << \"Failed to map android blob buffer\";\n+\t\t\treturn;\n+\t\t}\n+\n \t\tstd::unique_ptr reqDescriptor =\n \t\t\tstd::make_unique();\n \t\t*reqDescriptor = std::move(descriptor);\n@@ -1175,7 +1186,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\t\t\t\t\t\t metadata);\n \t\t\t});\n \n-\t\tint ret = cameraStream->process(src, *buffer.buffer,\n+\t\tint ret = cameraStream->process(src, currentDescriptor->destBuffer_.get(),\n \t\t\t\t\t\tcurrentDescriptor->settings_,\n \t\t\t\t\t\tmetadata);\n \t\treturn;\n@@ -1255,6 +1266,13 @@ void CameraDevice::sendQueuedCaptureResults()\n \t\t\td->captureResult_.result = d->resultMetadata_->get();\n \t\t\tcallbacks_->process_capture_result(callbacks_,\n \t\t\t\t\t\t\t &(d->captureResult_));\n+\t\t\t/*\n+\t\t\t * reset() here drops the error logs in\n+\t\t\t * https://paste.debian.net/1210728/ significantly.\n+\t\t\t * It still happens intermittently so comment the reset()\n+\t\t\t * out to see persistantly.\n+\t\t\t */\n+\t\t\td->destBuffer_.reset();\n \t\t\tqueuedDescriptor_.pop_front();\n \t\t} else {\n \t\t\tbreak;\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 36425773..330c69a3 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -96,6 +96,7 @@ private:\n \t\t\tFINISHED_FAILED,\n \t\t};\n \t\tstd::unique_ptr resultMetadata_;\n+\t\tstd::unique_ptr destBuffer_;\n \t\tcamera3_capture_result_t captureResult_;\n \t\tlibcamera::FrameBuffer *internalBuffer_;\n \t\tcompletionStatus status_;\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 81af53af..1939cb9c 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -101,26 +101,14 @@ int CameraStream::configure()\n }\n \n int CameraStream::process(const FrameBuffer *source,\n-\t\t\t buffer_handle_t camera3Dest,\n+\t\t\t CameraBuffer *destBuffer,\n \t\t\t const CameraMetadata &requestMetadata,\n \t\t\t CameraMetadata *resultMetadata)\n {\n \tif (!postProcessor_)\n \t\treturn 0;\n \n-\t/*\n-\t * \\todo Buffer mapping and processing should be moved to a\n-\t * separate thread.\n-\t */\n-\tconst StreamConfiguration &output = configuration();\n-\tCameraBuffer dest(camera3Dest, formats::MJPEG, output.size,\n-\t\t\t PROT_READ | PROT_WRITE);\n-\tif (!dest.isValid()) {\n-\t\tLOG(HAL, Error) << \"Failed to map android blob buffer\";\n-\t\treturn -EINVAL;\n-\t}\n-\n-\treturn postProcessor_->process(source, &dest, requestMetadata, resultMetadata);\n+\treturn postProcessor_->process(source, destBuffer, requestMetadata, resultMetadata);\n }\n \n void CameraStream::handlePostProcessing(PostProcessor::Status status)\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex f9b11e5d..ad03e4cf 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -122,7 +122,7 @@ public:\n \n \tint configure();\n \tint process(const libcamera::FrameBuffer *source,\n-\t\t buffer_handle_t camera3Dest,\n+\t\t CameraBuffer *destBuffer,\n \t\t const CameraMetadata &requestMetadata,\n \t\t CameraMetadata *resultMetadata);\n \tlibcamera::FrameBuffer *getBuffer();\n","prefixes":["libcamera-devel","v1","5/6"]}