Patch Detail
Show a patch.
GET /api/1.1/patches/13533/?format=api
{ "id": 13533, "url": "https://patchwork.libcamera.org/api/1.1/patches/13533/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13533/", "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": "<20210827065905.880867-3-hiroh@chromium.org>", "date": "2021-08-27T06:59:05", "name": "[libcamera-devel,v4,3/3] android: camera_buffer: Add stride/offset/size function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "289f1ea7d38b8dec58b55f8012678bcb0d2aa1ae", "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/13533/mbox/", "series": [ { "id": 2405, "url": "https://patchwork.libcamera.org/api/1.1/series/2405/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2405", "date": "2021-08-27T06:59:03", "name": "[libcamera-devel,v4,1/3] android: generic_camera_buffer: Correct buffer mapping", "version": 4, "mbox": "https://patchwork.libcamera.org/series/2405/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13533/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13533/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 138CABD87D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 27 Aug 2021 06:59:19 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B97F068928;\n\tFri, 27 Aug 2021 08:59:18 +0200 (CEST)", "from mail-pl1-x634.google.com (mail-pl1-x634.google.com\n\t[IPv6:2607:f8b0:4864:20::634])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 62FD96893B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 27 Aug 2021 08:59:17 +0200 (CEST)", "by mail-pl1-x634.google.com with SMTP id m17so3360153plc.6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 26 Aug 2021 23:59:17 -0700 (PDT)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:e14c:e27b:81d2:aa99])\n\tby smtp.gmail.com with ESMTPSA id\n\tl19sm4949627pjq.10.2021.08.26.23.59.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 26 Aug 2021 23:59: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=\"nTvWcd6k\"; 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=DLwpr4LyMm5yT5+SM/lmsgbwlqucqV7ToOM4oI9bFDo=;\n\tb=nTvWcd6kaUPtYPXWDZvzHIY/Nyen0dm2IpelYuf2fHUzq1kEg/utd/jVGn0pG+omih\n\tKsdsFxUQWz3TTvfKcX8G5ry5crcW72UebxHxeF0nAuFsy89NTDiDFGF3ypPiviHvjK7L\n\tbaQdPxhaROMb4zcqXYJT6l0lQQLP+Vn8gko7E=", "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=DLwpr4LyMm5yT5+SM/lmsgbwlqucqV7ToOM4oI9bFDo=;\n\tb=i4quke9+kYbkXHlQahvOHNtXDCj9ad3X6kn/r2KmbYBrPBnOw/N+M1PdruvWvOMxHS\n\ty+BxMO95i0E8etNv9e3L/cs0rm98NtjtYzdhkCJbX+o2mY8WNO13OYzirD5EWsZ2J+vS\n\tPSntKC2ptL4UaLoSijkJZpWmYl+6LbqNoR58NMY4i/0XI29VpQlNSVPisxNyW32OHxlB\n\tWx0LNqTmpoUra97UX5hVB/jqcB/7Zr9P6nIjG16mLj20F/x8nqhUuX/vOK8OOMbXL8gV\n\tN5PS1cUihvRhgrBpaTli+9mov16sN81wS3mhXuB36V2LCkLBu2w3cO+yNiEU3y776k3C\n\tUesA==", "X-Gm-Message-State": "AOAM533VWn8GKLpqlmD1xQRd9J0El1pkw65AE0IWK9MVVNGkeD2EU+zi\n\tGHzb4L81248VgPScKGIrt23pAaJTWhrB9Q==", "X-Google-Smtp-Source": "ABdhPJyXjOTq9eIm128GCmmioRbN26TlWjCHXhKbtzDSyPTWVAdICNQLecBCW9XksDbBmG41B7/9iw==", "X-Received": "by 2002:a17:90a:7884:: with SMTP id\n\tx4mr22077967pjk.53.1630047555636; \n\tThu, 26 Aug 2021 23:59:15 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 27 Aug 2021 15:59:05 +0900", "Message-Id": "<20210827065905.880867-3-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.33.0.259.gc128427fd7-goog", "In-Reply-To": "<20210827065905.880867-1-hiroh@chromium.org>", "References": "<20210827065905.880867-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 3/3] android: camera_buffer: Add\n\tstride/offset/size function", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This adds getter functions of stride, offset and size to CameraBuffer\ninterface.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_buffer.h | 16 +++++++++++++\n src/android/mm/cros_camera_buffer.cpp | 19 +++++++++++++++\n src/android/mm/generic_camera_buffer.cpp | 30 ++++++++++++++++++++++++\n 3 files changed, 65 insertions(+)", "diff": "diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\nindex 87df2570..226a8f5c 100644\n--- a/src/android/camera_buffer.h\n+++ b/src/android/camera_buffer.h\n@@ -31,6 +31,10 @@ public:\n \tlibcamera::Span<const uint8_t> plane(unsigned int plane) const;\n \tlibcamera::Span<uint8_t> plane(unsigned int plane);\n \n+\tunsigned int stride(unsigned int plane) const;\n+\tunsigned int offset(unsigned int plane) const;\n+\tunsigned int size(unsigned int plane) const;\n+\n \tsize_t jpegBufferSize(size_t maxJpegBufferSize) const;\n };\n \n@@ -62,6 +66,18 @@ Span<uint8_t> CameraBuffer::plane(unsigned int plane)\t\t\t\\\n {\t\t\t\t\t\t\t\t\t\\\n \treturn _d()->plane(plane);\t\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n+unsigned int CameraBuffer::stride(unsigned int plane) const\t\t\\\n+{\t\t\t\t\t\t\t\t\t\\\n+\treturn _d()->stride(plane);\t\t\t\t\t\\\n+}\t\t\t\t\t\t\t\t\t\\\n+unsigned int CameraBuffer::offset(unsigned int plane) const\t\t\\\n+{\t\t\t\t\t\t\t\t\t\\\n+\treturn _d()->offset(plane);\t\t\t\t\t\\\n+}\t\t\t\t\t\t\t\t\t\\\n+unsigned int CameraBuffer::size(unsigned int plane) const\t\t\\\n+{\t\t\t\t\t\t\t\t\t\\\n+\treturn _d()->size(plane);\t\t\t\t\t\\\n+}\t\t\t\t\t\t\t\t\t\\\n size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const\t\\\n {\t\t\t\t\t\t\t\t\t\\\n \treturn _d()->jpegBufferSize(maxJpegBufferSize);\t\t\t\\\ndiff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp\nindex ba6650cf..44993379 100644\n--- a/src/android/mm/cros_camera_buffer.cpp\n+++ b/src/android/mm/cros_camera_buffer.cpp\n@@ -31,6 +31,10 @@ public:\n \n \tSpan<uint8_t> plane(unsigned int plane);\n \n+\tunsigned int stride(unsigned int plane) const;\n+\tunsigned int offset(unsigned int plane) const;\n+\tunsigned int size(unsigned int plane) const;\n+\n \tsize_t jpegBufferSize(size_t maxJpegBufferSize) const;\n \n private:\n@@ -111,6 +115,21 @@ Span<uint8_t> CameraBuffer::Private::plane(unsigned int plane)\n \t\t bufferManager_->GetPlaneSize(handle_, plane) };\n }\n \n+unsigned int CameraBuffer::Private::stride(unsigned int plane) const\n+{\n+\treturn cros::CameraBufferManager::GetPlaneStride(handle_, plane);\n+}\n+\n+unsigned int CameraBuffer::Private::offset(unsigned int plane) const\n+{\n+\treturn cros::CameraBufferManager::GetPlaneOffset(handle_, plane);\n+}\n+\n+unsigned int CameraBuffer::Private::size(unsigned int plane) const\n+{\n+\treturn cros::CameraBufferManager::GetPlaneSize(handle_, plane);\n+}\n+\n size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t maxJpegBufferSize) const\n {\n \treturn bufferManager_->GetPlaneSize(handle_, 0);\ndiff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\nindex 6677beb9..49f4a7a7 100644\n--- a/src/android/mm/generic_camera_buffer.cpp\n+++ b/src/android/mm/generic_camera_buffer.cpp\n@@ -34,10 +34,15 @@ public:\n \n \tSpan<uint8_t> plane(unsigned int plane);\n \n+\tunsigned int stride(unsigned int plane) const;\n+\tunsigned int offset(unsigned int plane) const;\n+\tunsigned int size(unsigned int plane) const;\n+\n \tsize_t jpegBufferSize(size_t maxJpegBufferSize) const;\n \n private:\n \tstruct PlaneInfo {\n+\t\tunsigned int stride;\n \t\tunsigned int offset;\n \t\tunsigned int size;\n \t};\n@@ -114,6 +119,7 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer,\n \t\tconst unsigned int planeSize =\n \t\t\tstride * ((size.height + vertSubSample - 1) / vertSubSample);\n \n+\t\tplaneInfo_[i].stride = stride;\n \t\tplaneInfo_[i].offset = offset;\n \t\tplaneInfo_[i].size = planeSize;\n \n@@ -148,6 +154,30 @@ Span<uint8_t> CameraBuffer::Private::plane(unsigned int plane)\n \treturn planes_[plane];\n }\n \n+unsigned int CameraBuffer::Private::stride(unsigned int plane) const\n+{\n+\tif (plane >= planeInfo_.size())\n+\t\treturn 0;\n+\n+\treturn planeInfo_[plane].stride;\n+}\n+\n+unsigned int CameraBuffer::Private::offset(unsigned int plane) const\n+{\n+\tif (plane >= planeInfo_.size())\n+\t\treturn 0;\n+\n+\treturn planeInfo_[plane].offset;\n+}\n+\n+unsigned int CameraBuffer::Private::size(unsigned int plane) const\n+{\n+\tif (plane >= planeInfo_.size())\n+\t\treturn 0;\n+\n+\treturn planeInfo_[plane].size;\n+}\n+\n size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const\n {\n \tASSERT(bufferLength_ >= 0);\n", "prefixes": [ "libcamera-devel", "v4", "3/3" ] }