[{"id":15814,"web_url":"https://patchwork.libcamera.org/comment/15814/","msgid":"","date":"2021-03-23T02:10:28","subject":"Re: [libcamera-devel] [PATCH 7/8] android: CameraDevice: Manage\n\tstaticMetadata_ with std::unique_ptr","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Tue, Mar 23, 2021 at 10:42:25AM +0900, Hirokazu Honda wrote:\n\nA commit message would be nice :-)\n\n> Signed-off-by: Hirokazu Honda \n\nReviewed-by: Laurent Pinchart \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 b000d332..696f7676 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>","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 891C0C32E1\n\tfor ;\n\tTue, 23 Mar 2021 02:11:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 48F7168D6A;\n\tTue, 23 Mar 2021 03:11:11 +0100 (CET)","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 2EB8168D65\n\tfor ;\n\tTue, 23 Mar 2021 03:11:10 +0100 (CET)","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 AC069885;\n\tTue, 23 Mar 2021 03:11:09 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LnV3nArg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1616465469;\n\tbh=wKyuAq2pGuXq0Khr5+h1LDgU4W4gh414NpiN7d0lnUk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=LnV3nArg7VqeMlOX6i/IwMUMmx/7V6k4ZAN+8kcM+Ob7FVknGaxZ9ytJOVHCzyW6a\n\thWxb0A5nhE8cBRVQl1EAir80eeZCncRKLsDzf5SZX99MEKqJUN0xcp5TtGDYDflJnZ\n\tPqvRi30PVJ/qwbd9V4SqJ9q2JY205LFiLImSEoDY=","Date":"Tue, 23 Mar 2021 04:10:28 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210323014226.3211412-1-hiroh@chromium.org>\n\t<20210323014226.3211412-8-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210323014226.3211412-8-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH 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\" "}}]