From patchwork Wed Oct 27 12:41:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 14367 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 0F156BDB1C for ; Wed, 27 Oct 2021 12:41:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BFF806487F; Wed, 27 Oct 2021 14:41:55 +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="AA/uRH1f"; 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 2BFDB60123 for ; Wed, 27 Oct 2021 14:41:54 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.211]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 033B8596; Wed, 27 Oct 2021 14:41:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1635338513; bh=aFBQ1/k0w7h4CUShvra+HucLvAN7MX5MTP+ldvslHas=; h=From:To:Cc:Subject:Date:From; b=AA/uRH1f+OboeFWl868ORSmIr9g2GgkCFj7nA6FoJhwB7pJ8m9CfPzk7L91uuxTKV ljNLpXzpzyP4BN75U+zeVqxmC8hbDM+vwpmEJRDzm1SGYWvT2T/ClEVF+KMOtbt6zb qWWi900FWxgTkyC0YkKOqNszVrkbC1Q1Pl9FU6s0= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Wed, 27 Oct 2021 18:11:47 +0530 Message-Id: <20211027124147.356651-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: Camera3RequestDescriptor: Provide a constructor for StreamBuffer 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" Provide a constructor for StreamBuffer and use that while populating Camera3RequestDescriptor::buffers_ vector. Also provide the default move-constructor (required as StreamBuffer is stored in a vector in Camera3RequestDescriptor) and destructor for the StreamBuffer struct. Also initialize pointers members in the StreamBuffer struct to nullptr, with StreamBuffer::status set to Status::Success. Signed-off-by: Umang Jain --- src/android/camera_request.cpp | 16 +++++++++++++--- src/android/camera_request.h | 12 +++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp index 5bac1b8f..0b2946fb 100644 --- a/src/android/camera_request.cpp +++ b/src/android/camera_request.cpp @@ -37,9 +37,7 @@ Camera3RequestDescriptor::Camera3RequestDescriptor( CameraStream *stream = static_cast(buffer.stream->priv); - buffers_.push_back({ stream, buffer.buffer, nullptr, - buffer.acquire_fence, Status::Success, - nullptr, nullptr, nullptr, this }); + buffers_.emplace_back(stream, buffer, this); } /* Clone the controls associated with the camera3 request. */ @@ -54,3 +52,15 @@ Camera3RequestDescriptor::Camera3RequestDescriptor( } Camera3RequestDescriptor::~Camera3RequestDescriptor() = default; + +Camera3RequestDescriptor::StreamBuffer::StreamBuffer( + CameraStream *stream, const camera3_stream_buffer_t &buffer, + Camera3RequestDescriptor *request) + : camera3Buffer(buffer.buffer), fence(buffer.acquire_fence), + stream(stream), request(request) +{ +} + +Camera3RequestDescriptor::StreamBuffer::~StreamBuffer() = default; + +Camera3RequestDescriptor::StreamBuffer::StreamBuffer(StreamBuffer &&other) = default; diff --git a/src/android/camera_request.h b/src/android/camera_request.h index cfafa445..0a744aca 100644 --- a/src/android/camera_request.h +++ b/src/android/camera_request.h @@ -34,13 +34,19 @@ public: }; struct StreamBuffer { + StreamBuffer(CameraStream *stream, + const camera3_stream_buffer_t &buffer, + Camera3RequestDescriptor *request); + StreamBuffer(StreamBuffer &&other); + ~StreamBuffer(); + CameraStream *stream; buffer_handle_t *camera3Buffer; std::unique_ptr frameBuffer; int fence; - Status status; - libcamera::FrameBuffer *internalBuffer; - const libcamera::FrameBuffer *srcBuffer; + Status status = Status::Success; + libcamera::FrameBuffer *internalBuffer = nullptr; + const libcamera::FrameBuffer *srcBuffer = nullptr; std::unique_ptr dstBuffer; Camera3RequestDescriptor *request; };