{"id":11647,"url":"https://patchwork.libcamera.org/api/patches/11647/?format=json","web_url":"https://patchwork.libcamera.org/patch/11647/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-3-hiroh@chromium.org>","date":"2021-03-23T01:42:20","name":"[libcamera-devel,2/8] android: CameraHalManager: Hold CameraManager with std::unique_ptr","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d694514cb20624e268ac34867795ca7f77404b1f","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11647/mbox/","series":[{"id":1817,"url":"https://patchwork.libcamera.org/api/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/11647/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11647/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 BB602C32E1\n\tfor ;\n\tTue, 23 Mar 2021 01:42:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1852968D68;\n\tTue, 23 Mar 2021 02:42:42 +0100 (CET)","from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com\n\t[IPv6:2607:f8b0:4864:20::42c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B2A9A6084F\n\tfor ;\n\tTue, 23 Mar 2021 02:42:40 +0100 (CET)","by mail-pf1-x42c.google.com with SMTP id y200so12604386pfb.5\n\tfor ;\n\tMon, 22 Mar 2021 18:42:40 -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.37\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 22 Mar 2021 18:42:38 -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=\"E5j6sWSC\"; 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=lS3DA6l2AnNO2wp6Yf+lEL831G/077oi/y8UWQ5WLDU=;\n\tb=E5j6sWSCMt1lEdS3TW+gPleXW3K43DyoNuyfVW6Q+R3JaoWROfPKKw53pvIPHpUGqp\n\tXujw8O5fwhc1UbwP4xBEOlFSx9pvS4mirVkwQwQ2PF0CfeMwVrVrtJDQ0wRRUzSzlkgi\n\t8cevysQ8PQ9Ekaojkv7wz6W1SqKCbIUIxc2gM=","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=lS3DA6l2AnNO2wp6Yf+lEL831G/077oi/y8UWQ5WLDU=;\n\tb=h5nCerO3HxHmdLHPi0u8l/1PTcx+BfwqStd2AIWP3j3+QPNF9u0mcHKL4jb0ob45Ah\n\tTjzMPnv/u1u7XuhcBlVa/9z2+6aLV+/n+CL/hMEVtzkpP/S5g+IX7mgSm7LeUoAfWflT\n\tkAsrbTsNkSMP8OqA4lzfCTTN5T6HkQ2MSNUAEB7aJOWM8HD4Buz2Hqxc3fUtIEml63Sc\n\tbcB87dEyLuss2qu67tNgSo6rM/xgrpRSaLjLLb7YkXHD3NKjt4kLksIe+G86sQuMJ2DO\n\tknmOtbgVWpn+JUbEj4eYYlQnl8X0ZuuwOWXP7+gkFnJKfMhSbz3w7PYpiX7loY0FIvII\n\tVrVw==","X-Gm-Message-State":"AOAM530xwUExdBlWGS9JUV5lFZM+DWua8wGBJ+iRUSOzQ6GtWJnMtS0s\n\tNmThBCUatTSlAu0qtlbUWbyF1K2cMycyxQ==","X-Google-Smtp-Source":"ABdhPJw2FFs36zpi4+yipP1aTF8/0zuj9VpwwpKOmGffJRh/xfNhUVpu8V9oe3dIUZeAvMkhtCUFPQ==","X-Received":"by 2002:a65:5585:: with SMTP id j5mr1918658pgs.316.1616463759015;\n\tMon, 22 Mar 2021 18:42:39 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 23 Mar 2021 10:42:20 +0900","Message-Id":"<20210323014226.3211412-3-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 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---\n src/android/camera_hal_manager.cpp | 14 +++-----------\n src/android/camera_hal_manager.h | 2 +-\n 2 files changed, 4 insertions(+), 12 deletions(-)\n\n--\n2.31.0.rc2.261.g7f71774620-goog","diff":"diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex b3c85406..fa398fea 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -34,18 +34,11 @@ 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+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 +48,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","2/8"]}