Patch Detail
Show a patch.
GET /api/1.1/patches/11833/?format=api
{ "id": 11833, "url": "https://patchwork.libcamera.org/api/1.1/patches/11833/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11833/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20210403162247.1618154-1-hiroh@chromium.org>", "date": "2021-04-03T16:22:47", "name": "[libcamera-devel,v3] android: CameraBuffer: Mark as invalid if cros::CameraBufferManager::Register() fails", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e2f9971c08a482808cbaa2e9c2f4c733316cb715", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/1.1/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11833/mbox/", "series": [ { "id": 1889, "url": "https://patchwork.libcamera.org/api/1.1/series/1889/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1889", "date": "2021-04-03T16:22:47", "name": "[libcamera-devel,v3] android: CameraBuffer: Mark as invalid if cros::CameraBufferManager::Register() fails", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1889/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11833/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11833/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 AAA9EBD695\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 3 Apr 2021 16:22:57 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 21D4C602E6;\n\tSat, 3 Apr 2021 18:22:57 +0200 (CEST)", "from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com\n\t[IPv6:2607:f8b0:4864:20::1032])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9DB06602CF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 3 Apr 2021 18:22:55 +0200 (CEST)", "by mail-pj1-x1032.google.com with SMTP id\n\tq6-20020a17090a4306b02900c42a012202so3870590pjg.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 03 Apr 2021 09:22:55 -0700 (PDT)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:2:d1f5:1b96:f027:f646])\n\tby smtp.gmail.com with ESMTPSA id\n\t12sm11073718pgw.18.2021.04.03.09.22.52\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 03 Apr 2021 09:22:53 -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=\"EOjlb9nu\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; h=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=/7WPKnF1v7rmDLs+9qwxFiqmjTPt3Tvt18IHTeZdQyM=;\n\tb=EOjlb9nuy3NACuIHPCnByW+upx8Kf12yac6lu6UT4hgzljqCpgMYeANgDV6cCac3N3\n\tyTf3riSHMRaUM8l/4IeMbI6Rbvyci4Qt8+auEF+q0Z5xy9vy1s6PK6QSXH/XoOWg+HUX\n\tXDRJvMbczV5uMVVVHfyIXI/h4gV/6seVzVd6M=", "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:mime-version\n\t:content-transfer-encoding;\n\tbh=/7WPKnF1v7rmDLs+9qwxFiqmjTPt3Tvt18IHTeZdQyM=;\n\tb=kpRYwzQkZQmX+4MHFPSFjuNhAdAB1OKQ6vQmwNlokh9q3uzQQf0JvZ28yJNSeg6Olb\n\tpGUOR/MTiSM7JmBTPhBUOwCghtzD8/HuFVxGbvZcUhx4RaaSk2jpgykz06kwNKk39ai9\n\tN58ssrCv4XVdbcjTuMiElkrffGKJRkqT5aufB3Ks/QloGZ+nifvD1VEFQzZ/40S/mA9c\n\tCi+MYJCC/u7ETi4xW0D2m1ZFWBNPMv7nDSNAPMPGNSaolDRE8iVTnPUXjZ80NXd1En7R\n\t4ykTZCfCCUGI+mXOOaSDj2qd6WwKNgSrvtyxJDB8JGev/eGNx1pdAxvIW1I6EifeN8uA\n\tS40g==", "X-Gm-Message-State": "AOAM531+4CPG+ePivh8Dd7yMg6K8JV/LJ1bPMM5I2ioPQNZ79fhQqTGs\n\t+/S1OWGnjMGBl9kS/oAX/r9SFeESzdaSVw==", "X-Google-Smtp-Source": "ABdhPJz44ZUK7n0CkgADnl6KzV0hzRPMQJglNBsGvazNOWmlcUTS3WJjPyUH8Z5Qzw7jS7boSaqYPw==", "X-Received": "by 2002:a17:90a:cb98:: with SMTP id\n\ta24mr4494156pju.14.1617466973740; \n\tSat, 03 Apr 2021 09:22:53 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 4 Apr 2021 01:22:47 +0900", "Message-Id": "<20210403162247.1618154-1-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.31.0.208.g409f899ff0-goog", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3] android: CameraBuffer: Mark as invalid\n\tif cros::CameraBufferManager::Register() fails", "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": "cros::CameraBufferManager::Register() fails if a buffer handle\nis invalid. We should mark CameraBuffer as invalid on the failure\nof Register().\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\n src/android/mm/cros_camera_buffer.cpp | 22 +++++++++++++++-------\n 1 file changed, 15 insertions(+), 7 deletions(-)\n\n--\n2.31.0.208.g409f899ff0-goog", "diff": "diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp\nindex 7df4f47c..2a82d4b7 100644\n--- a/src/android/mm/cros_camera_buffer.cpp\n+++ b/src/android/mm/cros_camera_buffer.cpp\n@@ -37,6 +37,7 @@ private:\n \tbuffer_handle_t handle_;\n \tunsigned int numPlanes_;\n \tbool valid_;\n+\tbool registered_;\n \tunion {\n \t\tvoid *addr;\n \t\tandroid_ycbcr ycbcr;\n@@ -49,16 +50,21 @@ private:\n CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,\n \t\t\t buffer_handle_t camera3Buffer, int flags)\n \t: Extensible::Private(cameraBuffer), handle_(camera3Buffer),\n-\t numPlanes_(0), valid_(false)\n+\t numPlanes_(0), valid_(false), registered(false)\n {\n \tbufferManager_ = cros::CameraBufferManager::GetInstance();\n\n-\tbufferManager_->Register(camera3Buffer);\n+\tint ret = bufferManager_->Register(camera3Buffer);\n+\tif (ret) {\n+\t\tLOG(HAL, Error) << \"Failed registering a buffer: \" << ret;\n+\t\treturn;\n+\t}\n\n+\tregistered_ = true;\n \tnumPlanes_ = bufferManager_->GetNumPlanes(camera3Buffer);\n \tswitch (numPlanes_) {\n \tcase 1: {\n-\t\tint ret = bufferManager_->Lock(handle_, 0, 0, 0, 0, 0, &mem.addr);\n+\t\tret = bufferManager_->Lock(handle_, 0, 0, 0, 0, 0, &mem.addr);\n \t\tif (ret) {\n \t\t\tLOG(HAL, Error) << \"Single plane buffer mapping failed\";\n \t\t\treturn;\n@@ -67,8 +73,8 @@ CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,\n \t}\n \tcase 2:\n \tcase 3: {\n-\t\tint ret = bufferManager_->LockYCbCr(handle_, 0, 0, 0, 0, 0,\n-\t\t\t\t\t\t &mem.ycbcr);\n+\t\tret = bufferManager_->LockYCbCr(handle_, 0, 0, 0, 0, 0,\n+\t\t\t\t\t\t&mem.ycbcr);\n \t\tif (ret) {\n \t\t\tLOG(HAL, Error) << \"YCbCr buffer mapping failed\";\n \t\t\treturn;\n@@ -85,8 +91,10 @@ CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,\n\n CameraBuffer::Private::~Private()\n {\n-\tbufferManager_->Unlock(handle_);\n-\tbufferManager_->Deregister(handle_);\n+\tif (valid_)\n+\t\tbufferManager_->Unlock(handle_);\n+\tif (registered_)\n+\t\tbufferManager_->Deregister(handle_);\n }\n\n unsigned int CameraBuffer::Private::numPlanes() const\n", "prefixes": [ "libcamera-devel", "v3" ] }