{"id":11675,"url":"https://patchwork.libcamera.org/api/1.1/patches/11675/?format=json","web_url":"https://patchwork.libcamera.org/patch/11675/","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":"<20210324070757.3530377-3-hiroh@chromium.org>","date":"2021-03-24T07:07:51","name":"[libcamera-devel,v2,2/8] android: CameraHalManager: Hold CameraManager with std::unique_ptr","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"aac4efc0ad2c318dbb3b67f3a9db4bbc564f2273","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/11675/mbox/","series":[{"id":1825,"url":"https://patchwork.libcamera.org/api/1.1/series/1825/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1825","date":"2021-03-24T07:07:51","name":"Improve pointer types in android HAL adaptation layer","version":2,"mbox":"https://patchwork.libcamera.org/series/1825/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11675/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11675/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 4E902C32E7\n\tfor ;\n\tWed, 24 Mar 2021 07:08:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 91D4468D6A;\n\tWed, 24 Mar 2021 08:08:13 +0100 (CET)","from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com\n\t[IPv6:2607:f8b0:4864:20::52e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 01D8268D47\n\tfor ;\n\tWed, 24 Mar 2021 08:08:11 +0100 (CET)","by mail-pg1-x52e.google.com with SMTP id h25so14019064pgm.3\n\tfor ;\n\tWed, 24 Mar 2021 00:08:11 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:2:7c07:24cd:c637:7fab])\n\tby smtp.gmail.com with ESMTPSA id\n\te63sm1246860pfe.208.2021.03.24.00.08.06\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 24 Mar 2021 00:08:07 -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=\"BczBPItg\"; 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=8UxSnCmuALU/9Iixyz403NuafshZ1iLwjXQZHaAz1qI=;\n\tb=BczBPItgSO4JK9rUgzbCyHZu0YF8FnFbtaI9aHj4pFKmPbhRRaysnSxbRMMOlMESX8\n\tMdEnRtaYYIevmKgJowH7qhQWNm9HgPk2LOTf2/aUqUnKtdzMp37jZ6SuRTl7ink1hCnO\n\tBc/xzTimASPDj4i7z5sjZ0P+KPd3Ufiayn+7A=","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=8UxSnCmuALU/9Iixyz403NuafshZ1iLwjXQZHaAz1qI=;\n\tb=LGSEqQI6Eyk1NYMZSl08m/IEX1NkxYGN9wfswZ0UdM10H6gYLWY+27S6HxfnRzPSHQ\n\tpNXgLITboYLYqIF30pYHfnp83Q5Ls731bGyuBFDi3lKvlM83w4+dFBJADH1QwMvlLLCz\n\twNCbxqZKqaNEm+uwf63H5WQpdBsiKCeDH+boHXD9cNoMriYAXXsVOOB81pw4ETwGmjrl\n\tS1ta6ZptwgtKNSAdvsYFH4McZd7kVSd/LT+H4IlllcksChnDGJ2JsYy2izEorQnXD1zX\n\t0wjsDMukvn0kSXoUl7gNRVqac7MJhom3z3ng14VpoT0t7P4Y+hTAfmj7lMLa9VDjEGfG\n\trdZA==","X-Gm-Message-State":"AOAM532a84WYx/HR9P0HZmXW3x0mDmVqPDf4dna6HcgyYl+EvZil9kpq\n\tcixuMIE4fKc/lIt3Sc1czP96zP29XG4MJQ==","X-Google-Smtp-Source":"ABdhPJxkdEYzpW4OvjM0vRRO16oRKNecM0nNlI5wFq3BmvWuxYxf5yBPLEs3U1MCiDEhXgmXJk2sPg==","X-Received":"by 2002:a63:c646:: with SMTP id x6mr1947334pgg.126.1616569687626;\n\tWed, 24 Mar 2021 00:08:07 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 24 Mar 2021 16:07:51 +0900","Message-Id":"<20210324070757.3530377-3-hiroh@chromium.org>","X-Mailer":"git-send-email 2.31.0.291.g576ba9dcdaf-goog","In-Reply-To":"<20210324070757.3530377-1-hiroh@chromium.org>","References":"<20210324070757.3530377-1-hiroh@chromium.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/8] android: CameraHalManager: Hold\n\tCameraManager 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":"CameraManager is owned by CameraHalManager. The ownership of the\nobject is not shared with other classes. So CameraHalManager\nshould manage CameraManager with std::unique_ptr.\n\nSigned-off-by: Hirokazu Honda \n---\n src/android/camera_hal_manager.cpp | 15 ++++-----------\n src/android/camera_hal_manager.h | 2 +-\n 2 files changed, 5 insertions(+), 12 deletions(-)\n\n--\n2.31.0.291.g576ba9dcdaf-goog","diff":"diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex b3c85406..b501f8db 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -34,18 +34,12 @@ CameraHalManager::CameraHalManager()\n {\n }\n\n-CameraHalManager::~CameraHalManager()\n-{\n-\tif (cameraManager_) {\n-\t\tcameraManager_->stop();\n-\t\tdelete cameraManager_;\n-\t\tcameraManager_ = nullptr;\n-\t}\n-}\n+/* CameraManager calls stop() in the destructor. */\n+CameraHalManager::~CameraHalManager() = default;\n\n int CameraHalManager::init()\n {\n-\tcameraManager_ = new CameraManager();\n+\tcameraManager_ = std::make_unique();\n\n \t/* Support camera hotplug. */\n \tcameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);\n@@ -55,8 +49,7 @@ int CameraHalManager::init()\n \tif (ret) {\n \t\tLOG(HAL, Error) << \"Failed to start camera manager: \"\n \t\t\t\t<< strerror(-ret);\n-\t\tdelete cameraManager_;\n-\t\tcameraManager_ = nullptr;\n+\t\tcameraManager_.reset();\n \t\treturn ret;\n \t}\n\ndiff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\nindex 65bb3554..dc4e37e5 100644\n--- a/src/android/camera_hal_manager.h\n+++ b/src/android/camera_hal_manager.h\n@@ -47,7 +47,7 @@ private:\n\n \tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n\n-\tlibcamera::CameraManager *cameraManager_;\n+\tstd::unique_ptr cameraManager_;\n\n \tconst camera_module_callbacks_t *callbacks_;\n \tstd::vector> cameras_;\n","prefixes":["libcamera-devel","v2","2/8"]}