{"id":11653,"url":"https://patchwork.libcamera.org/api/1.1/patches/11653/?format=json","web_url":"https://patchwork.libcamera.org/patch/11653/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210323014226.3211412-9-hiroh@chromium.org>","date":"2021-03-23T01:42:26","name":"[libcamera-devel,8/8] android: CameraDevice: Manage requestTemplates_ with std::unique_ptr","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"be48a90f4d4146793c0e54c2d653f3f16a4c75c8","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11653/mbox/","series":[{"id":1817,"url":"https://patchwork.libcamera.org/api/1.1/series/1817/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1817","date":"2021-03-23T01:42:18","name":"Improve pointer types in android HAL adaptation layer","version":1,"mbox":"https://patchwork.libcamera.org/series/1817/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11653/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11653/checks/","tags":{},"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 78FF0C32E1\n\tfor ;\n\tTue, 23 Mar 2021 01:42:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 34FD168D6D;\n\tTue, 23 Mar 2021 02:42:51 +0100 (CET)","from mail-pg1-x531.google.com (mail-pg1-x531.google.com\n\t[IPv6:2607:f8b0:4864:20::531])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E240768D68\n\tfor ;\n\tTue, 23 Mar 2021 02:42:48 +0100 (CET)","by mail-pg1-x531.google.com with SMTP id v3so10123291pgq.2\n\tfor ;\n\tMon, 22 Mar 2021 18:42:48 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:2:8115:e5cc:747b:64de])\n\tby smtp.gmail.com with ESMTPSA id\n\th13sm590527pjv.52.2021.03.22.18.42.46\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 22 Mar 2021 18:42:47 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"VVxopW0m\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=JMGCZzhkfpvJZ+7EN+9n+X1/aLKzRUMcbnPoXHohOp0=;\n\tb=VVxopW0mKn9DoLQFDaXEuHzpMwppPwZ/wn1j8qxA8lt1IsYxaNxeMtP43cPOh3aNmK\n\tDGQ5uViiGmUIuFWj2Xr96ARqjOX1Ek0amOiG3RCBSjolnaJNNT/7mxqiqu2goUX6Oviy\n\tP98FZfMJ/gjPo7gUbszqwQcPWR2zpkgo5uwzA=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=JMGCZzhkfpvJZ+7EN+9n+X1/aLKzRUMcbnPoXHohOp0=;\n\tb=e+o6NR2b1XZDhePhVNyajAApvbAu+dbdrLImCPYLlfO9dTgkpy0YfeUhwcic1WVs/h\n\tVNi/35k343aZKcoqDBOmbSmbPRv99dhsuFCQ0ydQXgvQ8/06GlRnS1Jz2RTANYA1jIr0\n\t0MynKOW1G4elRqA7fSzE25GNx8J4aDjhnizTOgjFJbwr+r91uoSiAPmoSiUWzQAmuN20\n\tcd77y4QGSAYB9nxLKjX39eDgzHzybcg3261sbzk1X2lMhKtFb3OiSKaxd90ncoRt1crZ\n\tsE79+TqrzRcmB8TupnAJUMO8oErT7mIzkLCU69hE6sfszV2pg/kV2VL0xf4wyqHdGUsr\n\t4dZQ==","X-Gm-Message-State":"AOAM531ojusIDmEtL+aBX/Dok4UNpDu3KrJYNa7sKw2Zr3hc5b7lKG3Q\n\tKINcZqt0snLAz784ia5QWDO3C8rYjcmxww==","X-Google-Smtp-Source":"ABdhPJwIekaAENFxH/ujNA8CD4WhkJVcIOIFDwpcz6NooUeqi7uhbJwXu6xA79m797lXgI13bBzNvQ==","X-Received":"by 2002:a63:5444:: with SMTP id e4mr1849108pgm.426.1616463767371;\n\tMon, 22 Mar 2021 18:42:47 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 23 Mar 2021 10:42:26 +0900","Message-Id":"<20210323014226.3211412-9-hiroh@chromium.org>","X-Mailer":"git-send-email 2.31.0.rc2.261.g7f71774620-goog","In-Reply-To":"<20210323014226.3211412-1-hiroh@chromium.org>","References":"<20210323014226.3211412-1-hiroh@chromium.org>","MIME-Version":"1.0","Subject":"[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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"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--\n2.31.0.rc2.261.g7f71774620-goog","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 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 \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\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 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","prefixes":["libcamera-devel","8/8"]}