[{"id":15895,"web_url":"https://patchwork.libcamera.org/comment/15895/","msgid":"<20210325085423.lbmz2ymupm3fthj4@uno.localdomain>","date":"2021-03-25T08:54:23","subject":"Re: [libcamera-devel] [PATCH v2 8/8] android: CameraDevice: Manage\n\trequestTemplates_ with std::unique_ptr","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:57PM +0900, Hirokazu Honda wrote:\n> CameraMetadata stored in requestTemplates_ in CameraDevice is\n> not necessary to be a raw pointer. This reduces the manual\n> new/delete code by changing the type to std::unique_ptr.\n>\n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Laurent Pinchart \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n> ---\n> src/android/camera_device.cpp | 22 ++++++++--------------\n> src/android/camera_device.h | 6 +++---\n> 2 files changed, 11 insertions(+), 17 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 8fdcb85a..5fbf6f82 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -338,11 +338,7 @@ CameraDevice::CameraDevice(unsigned int id, std::shared_ptr camera)\n> \t}\n> }\n>\n> -CameraDevice::~CameraDevice()\n> -{\n> -\tfor (auto &it : requestTemplates_)\n> -\t\tdelete it.second;\n> -}\n> +CameraDevice::~CameraDevice() = default;\n>\n> std::unique_ptr CameraDevice::create(unsigned int id,\n> \t\t\t\t\t\t std::shared_ptr cam)\n> @@ -1358,15 +1354,14 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \treturn staticMetadata_->get();\n> }\n>\n> -CameraMetadata *CameraDevice::requestTemplatePreview()\n> +std::unique_ptr CameraDevice::requestTemplatePreview()\n> {\n> \t/*\n> \t * \\todo Keep this in sync with the actual number of entries.\n> \t * Currently: 20 entries, 35 bytes\n> \t */\n> -\tCameraMetadata *requestTemplate = new CameraMetadata(21, 36);\n> +\tauto requestTemplate = std::make_unique(21, 36);\n> \tif (!requestTemplate->isValid()) {\n> -\t\tdelete requestTemplate;\n> \t\treturn nullptr;\n> \t}\n>\n> @@ -1454,9 +1449,9 @@ CameraMetadata *CameraDevice::requestTemplatePreview()\n> \treturn requestTemplate;\n> }\n>\n> -CameraMetadata *CameraDevice::requestTemplateVideo()\n> +std::unique_ptr CameraDevice::requestTemplateVideo()\n> {\n> -\tCameraMetadata *previewTemplate = requestTemplatePreview();\n> +\tstd::unique_ptr previewTemplate = requestTemplatePreview();\n> \tif (!previewTemplate)\n> \t\treturn nullptr;\n>\n> @@ -1488,7 +1483,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> \t\treturn it->second->get();\n>\n> \t/* Use the capture intent matching the requested template type. */\n> -\tCameraMetadata *requestTemplate;\n> +\tstd::unique_ptr requestTemplate;\n> \tuint8_t captureIntent;\n> \tswitch (type) {\n> \tcase CAMERA3_TEMPLATE_PREVIEW:\n> @@ -1521,15 +1516,14 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n>\n> \tif (!requestTemplate || !requestTemplate->isValid()) {\n> \t\tLOG(HAL, Error) << \"Failed to construct request template\";\n> -\t\tdelete requestTemplate;\n> \t\treturn nullptr;\n> \t}\n>\n> \trequestTemplate->updateEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n> \t\t\t\t &captureIntent, 1);\n>\n> -\trequestTemplates_[type] = requestTemplate;\n> -\treturn requestTemplate->get();\n> +\trequestTemplates_[type] = std::move(requestTemplate);\n> +\treturn requestTemplates_[type]->get();\n> }\n>\n> PixelFormat CameraDevice::toPixelFormat(int format) const\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index cea82b24..09c395ff 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -97,8 +97,8 @@ private:\n> \tlibcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);\n> \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n> \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n> -\tCameraMetadata *requestTemplatePreview();\n> -\tCameraMetadata *requestTemplateVideo();\n> +\tstd::unique_ptr requestTemplatePreview();\n> +\tstd::unique_ptr requestTemplateVideo();\n> \tlibcamera::PixelFormat toPixelFormat(int format) const;\n> \tint processControls(Camera3RequestDescriptor *descriptor);\n> \tstd::unique_ptr getResultMetadata(\n> @@ -114,7 +114,7 @@ private:\n> \tstd::unique_ptr config_;\n>\n> \tstd::unique_ptr staticMetadata_;\n> -\tstd::map requestTemplates_;\n> +\tstd::map> requestTemplates_;\n> \tconst camera3_callback_ops_t *callbacks_;\n>\n> \tstd::vector streamConfigurations_;\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 2C714BDC66\n\tfor ;\n\tThu, 25 Mar 2021 08:53:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EC91D68D6C;\n\tThu, 25 Mar 2021 09:53:51 +0100 (CET)","from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8D91868D58\n\tfor ;\n\tThu, 25 Mar 2021 09:53:50 +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 relay7-d.mail.gandi.net (Postfix) with ESMTPSA id F2BBD2000C;\n\tThu, 25 Mar 2021 08:53:49 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","Date":"Thu, 25 Mar 2021 09:54:23 +0100","From":"Jacopo Mondi ","To":"Hirokazu Honda ","Message-ID":"<20210325085423.lbmz2ymupm3fthj4@uno.localdomain>","References":"<20210324070757.3530377-1-hiroh@chromium.org>\n\t<20210324070757.3530377-9-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210324070757.3530377-9-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 8/8] android: CameraDevice: Manage\n\trequestTemplates_ with std::unique_ptr","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\" "}}]