From patchwork Wed Oct 27 14:16:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 14370 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 E4DB2BF415 for ; Wed, 27 Oct 2021 14:16:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 386AA64882; Wed, 27 Oct 2021 16:16:31 +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="WdMEgqMw"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DB27360123 for ; Wed, 27 Oct 2021 16:16:29 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.211]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AFD20276; Wed, 27 Oct 2021 16:16:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1635344189; bh=PvfxNO13JhsEoCFDo6zOBGWBYINY6M+SJfKCjpObs0M=; h=From:To:Cc:Subject:Date:From; b=WdMEgqMw5dhrBYMhtbkfqm20h2r84KONbFMk4Pz8TLE70femZ54+zr2S2/eW7OB7P h97plZqGlMQMv5zmKoMn7kqu3D8tvlaFih5z/9d2AYRaSzB8WsGb/vaq5sURl5HsqO ZxrFOXBYn99WY67qJJV5RyE8M/QJfYh2ytiVc1ic= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Wed, 27 Oct 2021 19:46:23 +0530 Message-Id: <20211027141623.422927-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] 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 declare a default move assignment operator and disable the copy constructor and move operator explicitly with LIBCAMERA_DISABLE_COPY(). While at it, initialize pointers members in the StreamBuffer struct to nullptr, with StreamBuffer::status set to Status::Success. Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart --- Changes in v2: - Declare default move-assignment operator which is then explicitly disabled by LIBCAMERA_DISABLE_MOVE() macro along with copy constructor (enforced by the macro). --- src/android/camera_request.cpp | 16 +++++++++++++--- src/android/camera_request.h | 16 +++++++++++++--- 2 files changed, 26 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..618e1fc1 100644 --- a/src/android/camera_request.h +++ b/src/android/camera_request.h @@ -34,15 +34,25 @@ public: }; struct StreamBuffer { + StreamBuffer(CameraStream *stream, + const camera3_stream_buffer_t &buffer, + Camera3RequestDescriptor *request); + ~StreamBuffer(); + StreamBuffer(StreamBuffer &&other); + StreamBuffer &operator=(StreamBuffer &&) = default; + 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; + + private: + LIBCAMERA_DISABLE_COPY(StreamBuffer) }; /* Keeps track of streams requiring post-processing. */