[{"id":15893,"web_url":"https://patchwork.libcamera.org/comment/15893/","msgid":"<20210325085154.esyxaqoa343isblx@uno.localdomain>","date":"2021-03-25T08:51:54","subject":"Re: [libcamera-devel] [PATCH v2 6/8] android:\n\tCamera3RequestDescriptor: Manage buffers with std::vector","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Hiro,\n\nOn Wed, Mar 24, 2021 at 04:07:55PM +0900, Hirokazu Honda wrote:\n> Camera3RequestDescriptor has a length and an allocated buffer\n> for camera_stream_buffer_t array. This replaces the variables\n> with std::vector.\n>\n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Laurent Pinchart \n\nThe code reads nicer!\n\nReviewed-by: Jacopo Mondi \n\n\n> ---\n> src/android/camera_device.cpp | 47 ++++++++++++++++-------------------\n> src/android/camera_device.h | 3 +--\n> 2 files changed, 22 insertions(+), 28 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index c0630e53..e75fd25f 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -271,16 +271,16 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n> \tframeNumber_ = camera3Request->frame_number;\n>\n> \t/* Copy the camera3 request stream information for later access. */\n> -\tnumBuffers_ = camera3Request->num_output_buffers;\n> -\tbuffers_ = new camera3_stream_buffer_t[numBuffers_];\n> -\tfor (unsigned int i = 0; i < numBuffers_; ++i)\n> +\tconst uint32_t numBuffers = camera3Request->num_output_buffers;\n> +\tbuffers_.resize(numBuffers);\n> +\tfor (uint32_t i = 0; i < numBuffers; i++)\n> \t\tbuffers_[i] = camera3Request->output_buffers[i];\n>\n> \t/*\n> \t * FrameBuffer instances created by wrapping a camera3 provided dmabuf\n> \t * are emplaced in this vector of unique_ptr<> for lifetime management.\n> \t */\n> -\tframeBuffers_.reserve(numBuffers_);\n> +\tframeBuffers_.reserve(numBuffers);\n>\n> \t/* Clone the controls associated with the camera3 request. */\n> \tsettings_ = CameraMetadata(camera3Request->settings);\n> @@ -294,10 +294,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n> \t\t\t\t\t\t reinterpret_cast(this));\n> }\n>\n> -CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n> -{\n> -\tdelete[] buffers_;\n> -}\n> +CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n>\n> /*\n> * \\class CameraDevice\n> @@ -1840,10 +1837,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\tdescriptor->settings_ = lastSettings_;\n>\n> \tLOG(HAL, Debug) << \"Queueing request \" << descriptor->request_->cookie()\n> -\t\t\t<< \" with \" << descriptor->numBuffers_ << \" streams\";\n> -\tfor (unsigned int i = 0; i < descriptor->numBuffers_; ++i) {\n> -\t\tconst camera3_stream_buffer_t *camera3Buffer = &descriptor->buffers_[i];\n> -\t\tcamera3_stream *camera3Stream = camera3Buffer->stream;\n> +\t\t\t<< \" with \" << descriptor->buffers_.size() << \" streams\";\n> +\tfor (unsigned int i = 0; i < descriptor->buffers_.size(); ++i) {\n> +\t\tconst camera3_stream_buffer_t &camera3Buffer = descriptor->buffers_[i];\n> +\t\tcamera3_stream *camera3Stream = camera3Buffer.stream;\n> \t\tCameraStream *cameraStream = static_cast(camera3Stream->priv);\n>\n> \t\tstd::stringstream ss;\n> @@ -1874,7 +1871,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\t\t * associate it with the Camera3RequestDescriptor for\n> \t\t\t * lifetime management only.\n> \t\t\t */\n> -\t\t\tbuffer = createFrameBuffer(*camera3Buffer->buffer);\n> +\t\t\tbuffer = createFrameBuffer(*camera3Buffer.buffer);\n> \t\t\tdescriptor->frameBuffers_.emplace_back(buffer);\n> \t\t\tLOG(HAL, Debug) << ss.str() << \" (direct)\";\n> \t\t\tbreak;\n> @@ -1899,7 +1896,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\t}\n>\n> \t\tdescriptor->request_->addBuffer(cameraStream->stream(), buffer,\n> -\t\t\t\t\t\tcamera3Buffer->acquire_fence);\n> +\t\t\t\t\t\tcamera3Buffer.acquire_fence);\n> \t}\n>\n> \t/*\n> @@ -1930,7 +1927,7 @@ void CameraDevice::requestComplete(Request *request)\n> \t}\n>\n> \tLOG(HAL, Debug) << \"Request \" << request->cookie() << \" completed with \"\n> -\t\t\t<< descriptor->numBuffers_ << \" streams\";\n> +\t\t\t<< descriptor->buffers_.size() << \" streams\";\n>\n> \t/*\n> \t * \\todo The timestamp used for the metadata is currently always taken\n> @@ -1942,9 +1939,9 @@ void CameraDevice::requestComplete(Request *request)\n> \tresultMetadata = getResultMetadata(descriptor, timestamp);\n>\n> \t/* Handle any JPEG compression. */\n> -\tfor (unsigned int i = 0; i < descriptor->numBuffers_; ++i) {\n> +\tfor (camera3_stream_buffer_t &buffer : descriptor->buffers_) {\n> \t\tCameraStream *cameraStream =\n> -\t\t\tstatic_cast(descriptor->buffers_[i].stream->priv);\n> +\t\t\tstatic_cast(buffer.stream->priv);\n>\n> \t\tif (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB)\n> \t\t\tcontinue;\n> @@ -1956,7 +1953,7 @@ void CameraDevice::requestComplete(Request *request)\n> \t\t}\n>\n> \t\tint ret = cameraStream->process(*src,\n> -\t\t\t\t\t\t*descriptor->buffers_[i].buffer,\n> +\t\t\t\t\t\t*buffer.buffer,\n> \t\t\t\t\t\tdescriptor->settings_,\n> \t\t\t\t\t\tresultMetadata.get());\n> \t\tif (ret) {\n> @@ -1975,15 +1972,13 @@ void CameraDevice::requestComplete(Request *request)\n> \t/* Prepare to call back the Android camera stack. */\n> \tcamera3_capture_result_t captureResult = {};\n> \tcaptureResult.frame_number = descriptor->frameNumber_;\n> -\tcaptureResult.num_output_buffers = descriptor->numBuffers_;\n> -\tfor (unsigned int i = 0; i < descriptor->numBuffers_; ++i) {\n> -\t\tdescriptor->buffers_[i].acquire_fence = -1;\n> -\t\tdescriptor->buffers_[i].release_fence = -1;\n> -\t\tdescriptor->buffers_[i].status = status;\n> +\tcaptureResult.num_output_buffers = descriptor->buffers_.size();\n> +\tfor (camera3_stream_buffer_t &buffer : descriptor->buffers_) {\n> +\t\tbuffer.acquire_fence = -1;\n> +\t\tbuffer.release_fence = -1;\n> +\t\tbuffer.status = status;\n> \t}\n> -\tcaptureResult.output_buffers =\n> -\t\tconst_cast(descriptor->buffers_);\n> -\n> +\tcaptureResult.output_buffers = descriptor->buffers_.data();\n>\n> \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n> \t\tnotifyShutter(descriptor->frameNumber_, timestamp);\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 14e26b4d..a11cf243 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -74,8 +74,7 @@ private:\n> \t\t~Camera3RequestDescriptor();\n>\n> \t\tuint32_t frameNumber_;\n> -\t\tuint32_t numBuffers_;\n> -\t\tcamera3_stream_buffer_t *buffers_;\n> +\t\tstd::vector buffers_;\n> \t\tstd::vector> frameBuffers_;\n> \t\tCameraMetadata settings_;\n> \t\tstd::unique_ptr request_;\n> --\n> 2.31.0.291.g576ba9dcdaf-goog\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 CA241BDC66\n\tfor ;\n\tThu, 25 Mar 2021 08:51:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3A99B68D6C;\n\tThu, 25 Mar 2021 09:51:23 +0100 (CET)","from relay13.mail.gandi.net (relay13.mail.gandi.net\n\t[217.70.178.233])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 94B5368D58\n\tfor ;\n\tThu, 25 Mar 2021 09:51:21 +0100 (CET)","from uno.localdomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay13.mail.gandi.net (Postfix) with ESMTPSA id 128ED80017;\n\tThu, 25 Mar 2021 08:51:20 +0000 (UTC)"],"Date":"Thu, 25 Mar 2021 09:51:54 +0100","From":"Jacopo Mondi ","To":"Hirokazu Honda ","Message-ID":"<20210325085154.esyxaqoa343isblx@uno.localdomain>","References":"<20210324070757.3530377-1-hiroh@chromium.org>\n\t<20210324070757.3530377-7-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210324070757.3530377-7-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 6/8] android:\n\tCamera3RequestDescriptor: Manage buffers with std::vector","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]