From patchwork Fri Sep 10 07:06:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13805 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 03711BEFBE for ; Fri, 10 Sep 2021 07:07:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A203269174; Fri, 10 Sep 2021 09:07:02 +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="hFcGIGiM"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8316069169 for ; Fri, 10 Sep 2021 09:07:00 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.149]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 68D68883; Fri, 10 Sep 2021 09:06:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1631257620; bh=L5ElbkmgBrisKXGQ7Lfz+IPE87H2WKrEoB/zaDYeFPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hFcGIGiM4Jooqch2N/zHVfKrIjzLMJBBSDA9GsnedOTMceZq/xHzK54jcdGQMPPus 27oqykhvIYVzABluy8AtAGIhWmIbTV3ZZGh0/gNBWXdDq19cMOWDS5Awh22JZ98Q5d MFGakRu+vWJ5SBht4FnTNs+92OyZlmzLABAOqZrQ= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Fri, 10 Sep 2021 12:36:36 +0530 Message-Id: <20210910070638.467294-8-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210910070638.467294-1-umang.jain@ideasonboard.com> References: <20210910070638.467294-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 7/9] 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 for post processing currently happens in CameraStream::process(). 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. Camera3RequestDescriptor already hold other post-processing related context to enable async post processing in subsequent commits. Signed-off-by: Umang Jain --- src/android/camera_device.cpp | 14 +++++++++++++- src/android/camera_device.h | 1 + src/android/camera_stream.cpp | 16 ++-------------- src/android/camera_stream.h | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 7f04d225..988d4232 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1163,13 +1163,25 @@ 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); queuedDescriptor_.push_back(std::move(reqDescriptor)); Camera3RequestDescriptor *currentDescriptor = queuedDescriptor_.back().get(); - int ret = cameraStream->process(src, *buffer.buffer, + int ret = cameraStream->process(src, + currentDescriptor->destBuffer_.get(), currentDescriptor->settings_, currentDescriptor->resultMetadata_.get(), currentDescriptor); diff --git a/src/android/camera_device.h b/src/android/camera_device.h index e7318358..b62d373c 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -58,6 +58,7 @@ struct Camera3RequestDescriptor { 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 c7d874b2..5fd04bbf 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -102,7 +102,7 @@ int CameraStream::configure() } int CameraStream::process(const FrameBuffer *source, - buffer_handle_t camera3Dest, + CameraBuffer *destBuffer, const CameraMetadata &requestMetadata, CameraMetadata *resultMetadata, const Camera3RequestDescriptor *context) @@ -110,19 +110,7 @@ int CameraStream::process(const FrameBuffer *source, 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, + return postProcessor_->process(source, destBuffer, requestMetadata, resultMetadata, context); } diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index be076995..8097ddbc 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -124,7 +124,7 @@ public: int configure(); int process(const libcamera::FrameBuffer *source, - buffer_handle_t camera3Dest, + CameraBuffer *destBuffer, const CameraMetadata &requestMetadata, CameraMetadata *resultMetadata, const Camera3RequestDescriptor *context);