[{"id":15894,"web_url":"https://patchwork.libcamera.org/comment/15894/","msgid":"<20210325085253.dgxmvnv3tuu6pxbh@uno.localdomain>","date":"2021-03-25T08:52:53","subject":"Re: [libcamera-devel] [PATCH v2 7/8] android: CameraDevice: Manage\n\tstaticMetadata_ 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:56PM +0900, Hirokazu Honda wrote:\n> staticMetadata_ in CameraDevice is not necessary to be a raw\n> pointer. This reduces the manual new/delete code by changing the\n> 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> ---\n> src/android/camera_device.cpp | 14 ++++----------\n> src/android/camera_device.h | 2 +-\n> 2 files changed, 5 insertions(+), 11 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index e75fd25f..8fdcb85a 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -311,8 +311,7 @@ CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n>\n> CameraDevice::CameraDevice(unsigned int id, std::shared_ptr camera)\n> \t: id_(id), running_(false), camera_(std::move(camera)),\n> -\t staticMetadata_(nullptr), facing_(CAMERA_FACING_FRONT),\n> -\t orientation_(0)\n> +\t facing_(CAMERA_FACING_FRONT), orientation_(0)\n> {\n> \tcamera_->requestCompleted.connect(this, &CameraDevice::requestComplete);\n>\n> @@ -341,9 +340,6 @@ CameraDevice::CameraDevice(unsigned int id, std::shared_ptr camera)\n>\n> CameraDevice::~CameraDevice()\n> {\n> -\tif (staticMetadata_)\n> -\t\tdelete staticMetadata_;\n> -\n> \tfor (auto &it : requestTemplates_)\n> \t\tdelete it.second;\n> }\n> @@ -732,11 +728,10 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \tuint32_t numEntries;\n> \tuint32_t byteSize;\n> \tstd::tie(numEntries, byteSize) = calculateStaticMetadataSize();\n> -\tstaticMetadata_ = new CameraMetadata(numEntries, byteSize);\n> +\tstaticMetadata_ = std::make_unique(numEntries, byteSize);\n> \tif (!staticMetadata_->isValid()) {\n> \t\tLOG(HAL, Error) << \"Failed to allocate static metadata\";\n> -\t\tdelete staticMetadata_;\n> -\t\tstaticMetadata_ = nullptr;\n> +\t\tstaticMetadata_.reset();\n> \t\treturn nullptr;\n> \t}\n>\n> @@ -1356,8 +1351,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n>\n> \tif (!staticMetadata_->isValid()) {\n> \t\tLOG(HAL, Error) << \"Failed to construct static metadata\";\n> -\t\tdelete staticMetadata_;\n> -\t\tstaticMetadata_ = nullptr;\n> +\t\tstaticMetadata_.reset();\n> \t\treturn nullptr;\n> \t}\n>\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index a11cf243..cea82b24 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -113,7 +113,7 @@ private:\n> \tstd::shared_ptr camera_;\n> \tstd::unique_ptr config_;\n>\n> -\tCameraMetadata *staticMetadata_;\n> +\tstd::unique_ptr staticMetadata_;\n> \tstd::map requestTemplates_;\n> \tconst camera3_callback_ops_t *callbacks_;\n>\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 DE01ABDC66\n\tfor ;\n\tThu, 25 Mar 2021 08:52:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A644368D6C;\n\tThu, 25 Mar 2021 09:52:20 +0100 (CET)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E455668D58\n\tfor ;\n\tThu, 25 Mar 2021 09:52:19 +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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 777481C0010;\n\tThu, 25 Mar 2021 08:52:19 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","Date":"Thu, 25 Mar 2021 09:52:53 +0100","From":"Jacopo Mondi ","To":"Hirokazu Honda ","Message-ID":"<20210325085253.dgxmvnv3tuu6pxbh@uno.localdomain>","References":"<20210324070757.3530377-1-hiroh@chromium.org>\n\t<20210324070757.3530377-8-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210324070757.3530377-8-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 7/8] android: CameraDevice: Manage\n\tstaticMetadata_ 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\" "}}]