Patch Detail
Show a patch.
GET /api/patches/11682/?format=api
{ "id": 11682, "url": "https://patchwork.libcamera.org/api/patches/11682/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11682/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "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-8-hiroh@chromium.org>", "date": "2021-03-24T07:07:56", "name": "[libcamera-devel,v2,7/8] android: CameraDevice: Manage staticMetadata_ with std::unique_ptr", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "60bf38c0f5669c117c3d2a6315e8faa45eac6775", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11682/mbox/", "series": [ { "id": 1825, "url": "https://patchwork.libcamera.org/api/series/1825/?format=api", "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/11682/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11682/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 63F8EC32E7\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 24 Mar 2021 07:08:22 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2273368D62;\n\tWed, 24 Mar 2021 08:08:22 +0100 (CET)", "from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com\n\t[IPv6:2607:f8b0:4864:20::102a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0536E68D47\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 24 Mar 2021 08:08:21 +0100 (CET)", "by mail-pj1-x102a.google.com with SMTP id\n\tlr1-20020a17090b4b81b02900ea0a3f38c1so2180560pjb.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 24 Mar 2021 00:08:20 -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.14\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 24 Mar 2021 00:08:15 -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=\"Yt/eJjvy\"; 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=C5yhi2t31vH+/xv/5DHYTUWdfzioA1Oz+dXxUKn6obs=;\n\tb=Yt/eJjvyATeGzvBibfGlaL1OFIU7TafCWiUk0aSkG+1JU1lGFckxM4ERvM+GSJtxmB\n\tcwvn81B32tkD+/0m4t1xU7pD353fvQZAM5zfGZ+FpfPcC7+XDmj8MZYUguIg2TewYQP4\n\t7B9GQ3dANuB6FDc1eGZXhHePyCeUPHBI6YGXA=", "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=C5yhi2t31vH+/xv/5DHYTUWdfzioA1Oz+dXxUKn6obs=;\n\tb=LIg/afvUWyqMAy7aaw21PwdKKBtn/UKK0ASnB2Yq4E5WIbxrKbo4FoqT9puUVKQ9ZA\n\tX+j+WflF8X0U8BC9O+YaIJIxBRrDY0s4S+Kc49IDfB/Q/2DTqfkVaMMLwTRsdSquJFQH\n\tC0xGcL+h5VJOTxMPCgZu64ru7CS8dAcem2Ju8+PTYvo1q/bgt2tSuHHsS2KGaE336H9G\n\tEtBqIhQAqJQONG3gRmRm1P9hWrHDCfNb86WU5V01ybTvTQCY2nccVy3fuJfM08IP0QkZ\n\t/hU4pT0Tq6G76KVQKQ/uZYfC9HxF4TRKXUYQPB4EASkY6yBYI7tfDBW7G4Jyjju+suZY\n\tuP1A==", "X-Gm-Message-State": "AOAM531ra/Nan/YqAgm0y7pObMnO8XLdCZFKBP/aoFLQetjy4GcZRp58\n\tYyQq3kxMDdGFdLmzrX0tLd2pqaJ2KQCUwQ==", "X-Google-Smtp-Source": "ABdhPJwlr3L9m0D54YJP+5yfk6wvTo9Z6xhsugLFuzT0/f1jIRgdeYS046t83M6CBtNN1wRPAZeOXQ==", "X-Received": "by 2002:a17:902:ce88:b029:e6:3a3c:2f65 with SMTP id\n\tf8-20020a170902ce88b02900e63a3c2f65mr2402956plg.66.1616569695822; \n\tWed, 24 Mar 2021 00:08:15 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 24 Mar 2021 16:07:56 +0900", "Message-Id": "<20210324070757.3530377-8-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 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "staticMetadata_ in CameraDevice is not necessary to be a raw\npointer. This reduces the manual new/delete code by changing the\ntype to std::unique_ptr.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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.291.g576ba9dcdaf-goog", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex e75fd25f..8fdcb85a 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> 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> 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<CameraMetadata>(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<libcamera::Camera> camera_;\n \tstd::unique_ptr<libcamera::CameraConfiguration> config_;\n\n-\tCameraMetadata *staticMetadata_;\n+\tstd::unique_ptr<CameraMetadata> staticMetadata_;\n \tstd::map<unsigned int, const CameraMetadata *> requestTemplates_;\n \tconst camera3_callback_ops_t *callbacks_;\n\n", "prefixes": [ "libcamera-devel", "v2", "7/8" ] }