[{"id":15815,"web_url":"https://patchwork.libcamera.org/comment/15815/","msgid":"","date":"2021-03-23T02:15:58","subject":"Re: [libcamera-devel] [PATCH 8/8] android: CameraDevice: Manage\n\trequestTemplates_ 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:26AM +0900, Hirokazu Honda wrote:\n\nA commit message would be nice here too.\n\n> Signed-off-by: Hirokazu Honda \n> \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 696f7676..a9a29c76 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> +\tauto previewTemplate = requestTemplatePreview();\n\nWe tend to spell out types explicitly when it doesn't make lines overly\nlong:\n\n\tstd::unique_ptr previewTemplate = requestTemplatePreview();\n\nCould you do so here ? The reason is that it makes code easier to read\nby showing types explicitly. The use of 'auto' above is fine, as \n\n\tauto requestTemplate = std::make_unique(21, 36);\n\nshows the type through the right-hand side, while with\n\n\tauto previewTemplate = requestTemplatePreview();\n\none would have to look up the declaration of requestTemplatePreview().\n\nReviewed-by: Laurent Pinchart \n\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_;","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 A05D5BD80C\n\tfor ;\n\tTue, 23 Mar 2021 02:16:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 103C768D69;\n\tTue, 23 Mar 2021 03:16:43 +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 3ADE66084F\n\tfor ;\n\tTue, 23 Mar 2021 03:16:41 +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 A1D02885;\n\tTue, 23 Mar 2021 03:16:40 +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=\"Hqzli03D\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1616465800;\n\tbh=JjAf01r41XpiHkIOlDBSrK8Z1rGtx7PCnq4x2N4TQ0s=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Hqzli03DVppknacnXDqSUNGoIV3yefY7hwWVmf0s2GmND+OcQuq0/cQ4dVRygTQBE\n\tZa2myU+uxekZJczWVsPimN5JB/r4ab3h+d3G+K9ePWYlBAVYd+Z3r1teZWEH+8KoeM\n\tHWxDToYSKaDyzYj+Qwka8r2Egdwsf/l9e2KnKDzE=","Date":"Tue, 23 Mar 2021 04:15:58 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210323014226.3211412-1-hiroh@chromium.org>\n\t<20210323014226.3211412-9-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210323014226.3211412-9-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH 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\" "}}]