From patchwork Tue Sep 7 19:57:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13754 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 083B0BDC71 for ; Tue, 7 Sep 2021 19:57:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BE4E56916D; Tue, 7 Sep 2021 21:57:30 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ZlP4LIbM"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C1E8C60251 for ; Tue, 7 Sep 2021 21:57:28 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.2]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A92DE499; Tue, 7 Sep 2021 21:57:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1631044648; bh=PFpwrkJ/ZQlOblUyt/bDW1RxI2/xWFWSUbL08yj5qUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZlP4LIbMR1+3VtPs1ehmvcd1GWy+MYwP0GK651KXGPf4lg6ytRGZpqXNqL8ThPq/F F9KhJIlEMEQaav3aKNo2OhaOT4rCaJTE4jvIfI7utA5/nXXdGvcDlRdO9ovG+OBn1G tPe1L/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 Subject: [libcamera-devel] [PATCH v1 5/6] android: camera_device: Move buffer mapping for post-processing X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Buffer mapping currently happens in CameraStream::process() for post-processing. However, it can be easily be moved to CameraDevice just before the call to CameraStream::process(). The reason to do so is that we can hold the mapped destination buffer pointer as a part of Camera3RequestDescriptor. The Camera3RequestDescriptor already saves other post-processing related context, to enable async post processing. Signed-off-by: Umang Jain --- src/android/camera_device.cpp | 20 +++++++++++++++++++- src/android/camera_device.h | 1 + src/android/camera_stream.cpp | 16 ++-------------- src/android/camera_stream.h | 2 +- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 9d4ec02e..8741678d 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1162,6 +1162,17 @@ void CameraDevice::requestComplete(Request *request) descriptor.resultMetadata_ = std::move(resultMetadata); descriptor.captureResult_ = captureResult; + /* \todo Buffer mapping should be moved to a separate thread? */ + const StreamConfiguration &output = cameraStream->configuration(); + descriptor.destBuffer_ = std::make_unique(*buffer.buffer, + formats::MJPEG, + output.size, + PROT_READ | PROT_WRITE); + if (!descriptor.destBuffer_->isValid()) { + LOG(HAL, Error) << "Failed to map android blob buffer"; + return; + } + std::unique_ptr reqDescriptor = std::make_unique(); *reqDescriptor = std::move(descriptor); @@ -1175,7 +1186,7 @@ void CameraDevice::requestComplete(Request *request) metadata); }); - int ret = cameraStream->process(src, *buffer.buffer, + int ret = cameraStream->process(src, currentDescriptor->destBuffer_.get(), currentDescriptor->settings_, metadata); return; @@ -1255,6 +1266,13 @@ void CameraDevice::sendQueuedCaptureResults() d->captureResult_.result = d->resultMetadata_->get(); callbacks_->process_capture_result(callbacks_, &(d->captureResult_)); + /* + * reset() here drops the error logs in + * https://paste.debian.net/1210728/ significantly. + * It still happens intermittently so comment the reset() + * out to see persistantly. + */ + d->destBuffer_.reset(); queuedDescriptor_.pop_front(); } else { break; diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 36425773..330c69a3 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -96,6 +96,7 @@ private: FINISHED_FAILED, }; std::unique_ptr resultMetadata_; + std::unique_ptr destBuffer_; camera3_capture_result_t captureResult_; libcamera::FrameBuffer *internalBuffer_; completionStatus status_; diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 81af53af..1939cb9c 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -101,26 +101,14 @@ int CameraStream::configure() } int CameraStream::process(const FrameBuffer *source, - buffer_handle_t camera3Dest, + CameraBuffer *destBuffer, const CameraMetadata &requestMetadata, CameraMetadata *resultMetadata) { if (!postProcessor_) return 0; - /* - * \todo Buffer mapping and processing should be moved to a - * separate thread. - */ - const StreamConfiguration &output = configuration(); - CameraBuffer dest(camera3Dest, formats::MJPEG, output.size, - PROT_READ | PROT_WRITE); - if (!dest.isValid()) { - LOG(HAL, Error) << "Failed to map android blob buffer"; - return -EINVAL; - } - - return postProcessor_->process(source, &dest, requestMetadata, resultMetadata); + return postProcessor_->process(source, destBuffer, requestMetadata, resultMetadata); } void CameraStream::handlePostProcessing(PostProcessor::Status status) diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index f9b11e5d..ad03e4cf 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -122,7 +122,7 @@ public: int configure(); int process(const libcamera::FrameBuffer *source, - buffer_handle_t camera3Dest, + CameraBuffer *destBuffer, const CameraMetadata &requestMetadata, CameraMetadata *resultMetadata); libcamera::FrameBuffer *getBuffer();