[{"id":20593,"web_url":"https://patchwork.libcamera.org/comment/20593/","msgid":"","date":"2021-10-27T18:20:34","subject":"Re: [libcamera-devel] [PATCH v2] android: Camera3RequestDescriptor:\n\tProvide a constructor for StreamBuffer","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Umang,\n\nThank you for the patch.\n\nOn Wed, Oct 27, 2021 at 07:46:23PM +0530, Umang Jain wrote:\n> Provide a constructor for StreamBuffer and use that while populating\n> Camera3RequestDescriptor::buffers_ vector. Also provide the default\n> move-constructor (required as StreamBuffer is stored in a vector in\n> Camera3RequestDescriptor) and destructor for the StreamBuffer struct.\n> \n> Also declare a default move assignment operator and disable the\n> copy constructor and move operator explicitly with\n> LIBCAMERA_DISABLE_COPY().\n> \n> While at it, initialize pointers members in the StreamBuffer struct\n> to nullptr, with StreamBuffer::status set to Status::Success.\n> \n> Signed-off-by: Umang Jain \n> ---\n> Changes in v2:\n> - Declare default move-assignment operator which is then explicitly\n> disabled by LIBCAMERA_DISABLE_MOVE() macro along with copy\n> constructor (enforced by the macro).\n> ---\n> src/android/camera_request.cpp | 16 +++++++++++++---\n> src/android/camera_request.h | 16 +++++++++++++---\n> 2 files changed, 26 insertions(+), 6 deletions(-)\n> \n> diff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp\n> index 5bac1b8f..0b2946fb 100644\n> --- a/src/android/camera_request.cpp\n> +++ b/src/android/camera_request.cpp\n> @@ -37,9 +37,7 @@ Camera3RequestDescriptor::Camera3RequestDescriptor(\n> \t\tCameraStream *stream =\n> \t\t\tstatic_cast(buffer.stream->priv);\n> \n> -\t\tbuffers_.push_back({ stream, buffer.buffer, nullptr,\n> -\t\t\t\t buffer.acquire_fence, Status::Success,\n> -\t\t\t\t nullptr, nullptr, nullptr, this });\n> +\t\tbuffers_.emplace_back(stream, buffer, this);\n> \t}\n> \n> \t/* Clone the controls associated with the camera3 request. */\n> @@ -54,3 +52,15 @@ Camera3RequestDescriptor::Camera3RequestDescriptor(\n> }\n> \n> Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n> +\n> +Camera3RequestDescriptor::StreamBuffer::StreamBuffer(\n> +\tCameraStream *stream, const camera3_stream_buffer_t &buffer,\n> +\tCamera3RequestDescriptor *request)\n> +\t: camera3Buffer(buffer.buffer), fence(buffer.acquire_fence),\n> +\t stream(stream), request(request)\n> +{\n> +}\n> +\n> +Camera3RequestDescriptor::StreamBuffer::~StreamBuffer() = default;\n> +\n> +Camera3RequestDescriptor::StreamBuffer::StreamBuffer(StreamBuffer &&other) = default;\n> diff --git a/src/android/camera_request.h b/src/android/camera_request.h\n> index cfafa445..618e1fc1 100644\n> --- a/src/android/camera_request.h\n> +++ b/src/android/camera_request.h\n> @@ -34,15 +34,25 @@ public:\n> \t};\n> \n> \tstruct StreamBuffer {\n> +\t\tStreamBuffer(CameraStream *stream,\n> +\t\t\t const camera3_stream_buffer_t &buffer,\n> +\t\t\t Camera3RequestDescriptor *request);\n> +\t\t~StreamBuffer();\n\nI'd add a blank line here.\n\n> +\t\tStreamBuffer(StreamBuffer &&other);\n> +\t\tStreamBuffer &operator=(StreamBuffer &&) = default;\n\nThe = default should go to the .cpp file, the function doesn't need to\nbe inlined.\n\nReviewed-by: Laurent Pinchart \n\n> +\n> \t\tCameraStream *stream;\n> \t\tbuffer_handle_t *camera3Buffer;\n> \t\tstd::unique_ptr frameBuffer;\n> \t\tint fence;\n> -\t\tStatus status;\n> -\t\tlibcamera::FrameBuffer *internalBuffer;\n> -\t\tconst libcamera::FrameBuffer *srcBuffer;\n> +\t\tStatus status = Status::Success;\n> +\t\tlibcamera::FrameBuffer *internalBuffer = nullptr;\n> +\t\tconst libcamera::FrameBuffer *srcBuffer = nullptr;\n> \t\tstd::unique_ptr dstBuffer;\n> \t\tCamera3RequestDescriptor *request;\n> +\n> +\tprivate:\n> +\t\tLIBCAMERA_DISABLE_COPY(StreamBuffer)\n> \t};\n> \n> \t/* Keeps track of streams requiring post-processing. */","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 03E10BDB1C\n\tfor ;\n\tWed, 27 Oct 2021 18:21:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0E8476487F;\n\tWed, 27 Oct 2021 20:21:00 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7268560123\n\tfor ;\n\tWed, 27 Oct 2021 20:20:58 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D6D8B276;\n\tWed, 27 Oct 2021 20:20:57 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"EBE4HGCv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1635358858;\n\tbh=oE/d+rZiO93Df2lxsra06CPDdCSX/VN4qyAHGcX0H1g=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=EBE4HGCvXKKW7GceHq4c+qdcq6jdmyvxb1Qxsxm9PlUqjaf3FQ82FUYlmxTKapqlh\n\tPd+gUnPg++bSjQIjgLsN9YjNMLgHGMVxLD7PX7yG81Jl3k0L/RRIHGw9P48ncWWW6b\n\tCRxFS00Y646lD3Cm+Fd3xgZiVe7IPEpMpj7pz8uA=","Date":"Wed, 27 Oct 2021 21:20:34 +0300","From":"Laurent Pinchart ","To":"Umang Jain ","Message-ID":"","References":"<20211027141623.422927-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211027141623.422927-1-umang.jain@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2] android: Camera3RequestDescriptor:\n\tProvide a constructor for StreamBuffer","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]