{"id":11652,"url":"https://patchwork.libcamera.org/api/1.1/patches/11652/?format=json","web_url":"https://patchwork.libcamera.org/patch/11652/","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-8-hiroh@chromium.org>","date":"2021-03-23T01:42:25","name":"[libcamera-devel,7/8] android: CameraDevice: Manage staticMetadata_ with std::unique_ptr","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"60bf38c0f5669c117c3d2a6315e8faa45eac6775","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/11652/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/11652/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11652/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 E848AC32E1\n\tfor ;\n\tTue, 23 Mar 2021 01:42:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A9F1868D7B;\n\tTue, 23 Mar 2021 02:42:50 +0100 (CET)","from mail-pf1-x435.google.com (mail-pf1-x435.google.com\n\t[IPv6:2607:f8b0:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8066C68D65\n\tfor ;\n\tTue, 23 Mar 2021 02:42:47 +0100 (CET)","by mail-pf1-x435.google.com with SMTP id y5so12615288pfn.1\n\tfor ;\n\tMon, 22 Mar 2021 18:42:47 -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.44\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 22 Mar 2021 18:42:45 -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=\"EDY3hIMN\"; 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=F25CpZfGZLc+v5dCL7KCeC8aHDszpv2/2eWqJl9POf0=;\n\tb=EDY3hIMNm9LqByu5VcmalbQeDZyjWPonen58qCk0vwi0HCM7/zc/SCLu4KLgkLxY6E\n\tLIgiQsk5mHFNPSowdRqU36WooUkXuP2LEKdVq/U0FuEexBUkEro3SwCKum/I3JFBPdqE\n\tITygNqg5tQtnBlR2bXDHVo3JHJtjVH/rN7C3g=","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=F25CpZfGZLc+v5dCL7KCeC8aHDszpv2/2eWqJl9POf0=;\n\tb=OQqk9+lEZ3GYuLuWyEKZRjtIyO/jd+KAg1S9DPzrPDOyEmYns2y3+H9+gMppTXJU0a\n\t0er8ZHytGtRycR0yeTx9oMghTS3Fybj866E2gUn88Z8AZ92Ktw1thGa18UHlJNqWl+rG\n\t5O2Om7Rvmufw9crGdMweoyXbFOzVcoKESXatjBc91wlqwyVxEXDsYSJNF9umWFjNOJ09\n\tSI1FDBxhGYnGO0SlZtQ8F3MQVBtQuy5Ynv7B0RIz1tglF4JMsZLF+3mxCg/tst5JAjwl\n\tG/Pxj9ptmWLL7IEw7rVoC51SXZe+eGlGoQvVOXJYh3XolkxwvM7w1bsro4rEczwPq4cf\n\taBYA==","X-Gm-Message-State":"AOAM530q0qTzEx4zUGow6OfOl4pZ2fU6zqbvJp+NZixAOaWHS/3zVxFk\n\tvsj3oaSvQ4aMpaY0eVebXmEHOFxQXqWRHg==","X-Google-Smtp-Source":"ABdhPJyc9HNEdU/yZx4lg6z1PnUfjsam4O/NK8nY227mldE2nofgn+r5rrrDJATp7x3ur9/tXzT9sg==","X-Received":"by 2002:a62:7708:0:b029:1ee:f656:51d5 with SMTP id\n\ts8-20020a6277080000b02901eef65651d5mr2509873pfc.59.1616463766003; \n\tMon, 22 Mar 2021 18:42:46 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 23 Mar 2021 10:42:25 +0900","Message-Id":"<20210323014226.3211412-8-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 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","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 | 14 ++++----------\n src/android/camera_device.h | 2 +-\n 2 files changed, 5 insertions(+), 11 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 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\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 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","prefixes":["libcamera-devel","7/8"]}