From patchwork Tue Sep 28 16:25:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13970 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 54CDDC3243 for ; Tue, 28 Sep 2021 16:25:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 198C769191; Tue, 28 Sep 2021 18:25:53 +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="UCq7aZgd"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4570B69188 for ; Tue, 28 Sep 2021 18:25:51 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [IPv6:2405:204:8500:b152:4879:ab55:a9fb:2b15]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F20C13F1; Tue, 28 Sep 2021 18:25:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1632846351; bh=vNfa2qhRsWPxTF/8397tqGlV9f54+qqMV279rgK+LCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UCq7aZgdjQiGNKwTbaXc9XcH0G45RtrnJJQPzlw2ZdzCD2t7i1BUOpGqR/Fi3N40d A7RhO75S1Dh655YOhC+FW6fm6CuZlCRnBY7saTsvy7snmPmIC1GXEnefHHhTFFWVSD pWd+IrXQ0nn/TqjYbPxviLa6AeCFN23k0s9Yc4ms= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Tue, 28 Sep 2021 21:55:34 +0530 Message-Id: <20210928162536.227475-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210928162536.227475-1-umang.jain@ideasonboard.com> References: <20210928162536.227475-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/3] android: camera_worker: Use Camera3RequestDescriptor as cookie 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" Use Camera3RequestDescriptor as cookie for the Capture Request. The cookie is used to lookup descriptors map in CameraDevice::requestComplete(). The map will be transformed to a queue in subsequent commit. Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda --- src/android/camera_device.cpp | 3 ++- src/android/camera_worker.cpp | 4 ++-- src/android/camera_worker.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 0fe11fe8..9287ea07 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -244,7 +244,8 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor( * Create the CaptureRequest, stored as a unique_ptr<> to tie its * lifetime to the descriptor. */ - request_ = std::make_unique(camera); + request_ = std::make_unique(camera, + reinterpret_cast(this)); } /* diff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp index 91313183..dabb3054 100644 --- a/src/android/camera_worker.cpp +++ b/src/android/camera_worker.cpp @@ -27,10 +27,10 @@ LOG_DECLARE_CATEGORY(HAL) * by the CameraWorker which queues it to the libcamera::Camera after handling * fences. */ -CaptureRequest::CaptureRequest(Camera *camera) +CaptureRequest::CaptureRequest(Camera *camera, uint64_t cookie) : camera_(camera) { - request_ = camera_->createRequest(reinterpret_cast(this)); + request_ = camera_->createRequest(cookie); } void CaptureRequest::addBuffer(Stream *stream, FrameBuffer *buffer, int fence) diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h index 67ae50bd..c94f1632 100644 --- a/src/android/camera_worker.h +++ b/src/android/camera_worker.h @@ -8,6 +8,7 @@ #define __ANDROID_CAMERA_WORKER_H__ #include +#include #include #include @@ -22,7 +23,7 @@ class CameraDevice; class CaptureRequest { public: - CaptureRequest(libcamera::Camera *camera); + CaptureRequest(libcamera::Camera *camera, uint64_t cookie); const std::vector &fences() const { return acquireFences_; } libcamera::ControlList &controls() { return request_->controls(); }