{"id":13481,"url":"https://patchwork.libcamera.org/api/patches/13481/?format=json","web_url":"https://patchwork.libcamera.org/patch/13481/","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":"<20210825044410.2787433-4-hiroh@chromium.org>","date":"2021-08-25T04:44:10","name":"[libcamera-devel,v2,3/3] android: camera_buffer: Add stride/offset/size function","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d31c0211b7a712ba5bba801d6666fae38dbd4dca","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/13481/mbox/","series":[{"id":2390,"url":"https://patchwork.libcamera.org/api/series/2390/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2390","date":"2021-08-25T04:44:07","name":"Improve CameraBuffer implementation","version":2,"mbox":"https://patchwork.libcamera.org/series/2390/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13481/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13481/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 6D622C3242\n\tfor ;\n\tWed, 25 Aug 2021 04:44:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 176AC688A3;\n\tWed, 25 Aug 2021 06:44:33 +0200 (CEST)","from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com\n\t[IPv6:2607:f8b0:4864:20::52c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0372268892\n\tfor ;\n\tWed, 25 Aug 2021 06:44:29 +0200 (CEST)","by mail-pg1-x52c.google.com with SMTP id y23so21868289pgi.7\n\tfor ;\n\tTue, 24 Aug 2021 21:44:28 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:ddfd:dd12:81a2:3205])\n\tby smtp.gmail.com with ESMTPSA id\n\tn20sm2797544pfa.91.2021.08.24.21.44.25\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 24 Aug 2021 21:44:26 -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=\"iRDMgMsO\"; 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=F6JI3ObfUfhlsVHyi70Z6RRucXwbz8eAI8Qdz4/n36U=;\n\tb=iRDMgMsObnDjxWJ3vLK57gbITFvdzuj0Xw8z7LBWU+v51iSn22uujs/hiwl6pzDUGe\n\tvUuKPR1cmFVh6IcDTnmLsfq4tvnLpvBPzFfIjL6gICKBarQKRibtw+Q4JONHC483JTyR\n\tPt4RJY46uiidN0lBM/mHBaoLBQTwocVmzkRKw=","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=F6JI3ObfUfhlsVHyi70Z6RRucXwbz8eAI8Qdz4/n36U=;\n\tb=QJGv3Yeg9jrpP2ARqLj2VdbwWxI88+Vvlzu5K3GpZHqr5XDejXfwlGwuWUVH4CO4KA\n\tHXBkNYGmM5aOMvg+PVEfwoEllwo9y22ss69Bgn2kg6OzoGEIPegoX6FBA4K1Bd9/ZQ19\n\tMvmFhQz+sqi8Fg5W0qpr/JeWgsiF0HQWM3rCDLGcbHJ5u8cBfPPpCYE1yZuW1wI3G/Rh\n\tDnxQtYp4Njk2DK2KVb696KF+xsc9tFuk1GBbL6O96RhWmH9Do8rhog/WwZVcj+C4riK5\n\t6No2R4ZZL3kjJmZk6MTYKIREeAxxAohUQQL5XpsERTXzb6ext1c918neagJznmKfaIUN\n\t9uVA==","X-Gm-Message-State":"AOAM533FWQsfS8PUuz6KktTF+1z56L1jlkJjNo57r/b0u6oSBIH17UwY\n\tjpMxfgtiD5npS411W7yIetD7OAdkFJKyPA==","X-Google-Smtp-Source":"ABdhPJy/uRbAMcobqh9JO8A/0lfuI/Q5ZXBWbE3YLm0OCRAEd+TeOSvY0zMGQPEvA+xiDFqKlJJ77A==","X-Received":"by 2002:a62:1b97:0:b0:3ed:d347:fcac with SMTP id\n\tb145-20020a621b97000000b003edd347fcacmr6727366pfb.65.1629866667363; \n\tTue, 24 Aug 2021 21:44:27 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 25 Aug 2021 13:44:10 +0900","Message-Id":"<20210825044410.2787433-4-hiroh@chromium.org>","X-Mailer":"git-send-email 2.33.0.rc2.250.ged5fa647cd-goog","In-Reply-To":"<20210825044410.2787433-1-hiroh@chromium.org>","References":"<20210825044410.2787433-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This adds getter functions of stride, offset and size to CameraBuffer\ninterface.\n\nSigned-off-by: Hirokazu Honda \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 plane(unsigned int plane) const;\n \tlibcamera::Span 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 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 42546d87..bdbac16f 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 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@@ -112,6 +116,21 @@ Span 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 37868d26..d4f3f22b 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 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@@ -110,6 +115,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@@ -145,6 +151,30 @@ Span 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 \tif (maps_.empty()) {\n","prefixes":["libcamera-devel","v2","3/3"]}