From patchwork Mon Jul 6 15:38:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 8656 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 57688BD794 for ; Mon, 6 Jul 2020 15:38:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1CB6460E48; Mon, 6 Jul 2020 17:38:19 +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="wOnWiF+4"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9EF0D60E1D for ; Mon, 6 Jul 2020 17:38:14 +0200 (CEST) Received: from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1E5B4A16; Mon, 6 Jul 2020 17:38:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594049894; bh=a5CwUdAjxt3flUTMdLjOgunysTtRsVIh3WDEwpt9gzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wOnWiF+4abQ5Jt7e7VP2O5OM/CdbjL/N3LArpk0Jep4VXZpD0ugI+EYIV9pdCF4kw GdiSY/zizwrjyeXcx6tOdvYzHE622mMoZfdwJTG31ysK14ZGX9/B29IXiqxvSqii4h bhpU2Lhjga0Cys6X3h2pmwYcPhyIrL/jaO+45OYU= From: Kieran Bingham To: libcamera devel Date: Mon, 6 Jul 2020 16:38:05 +0100 Message-Id: <20200706153808.2340919-6-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200706153808.2340919-1-kieran.bingham@ideasonboard.com> References: <20200706153808.2340919-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 5/8] android: camera_device: Create the Request and Camera3RequestDescriptor together 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" Move the construction of the Request higher in the code flow so that multiple buffers and streams can be added where required. The Request is now stored as a unique_ptr within the Camera3RequestDescriptor to enforce a shared lifetime between the objects, freeing the Request when the descriptor is destroyed. Signed-off-by: Kieran Bingham Reviewed-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 9 ++++++--- src/android/camera_device.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 73cfab532cf5..fb120e8007dc 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1066,6 +1066,12 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques Camera3RequestDescriptor *descriptor = new Camera3RequestDescriptor(camera3Request->frame_number, camera3Request->num_output_buffers); + + Request *request = + camera_->createRequest(reinterpret_cast(descriptor)); + + descriptor->request = std::unique_ptr(request); + for (unsigned int i = 0; i < descriptor->numBuffers; ++i) { /* * Keep track of which stream the request belongs to and store @@ -1089,14 +1095,11 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques return -ENOMEM; } - Request *request = - camera_->createRequest(reinterpret_cast(descriptor)); request->addBuffer(stream, buffer); int ret = camera_->queueRequest(request); if (ret) { LOG(HAL, Error) << "Failed to queue request"; - delete request; delete descriptor; return ret; } diff --git a/src/android/camera_device.h b/src/android/camera_device.h index d7834d94f439..018491d70c0a 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -61,6 +61,7 @@ private: uint32_t frameNumber; uint32_t numBuffers; camera3_stream_buffer_t *buffers; + std::unique_ptr request; }; struct Camera3StreamConfiguration {