From patchwork Mon Aug 23 12:43:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 13432 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 30895C3241 for ; Mon, 23 Aug 2021 12:43:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3E2A5688AE; Mon, 23 Aug 2021 14:43:34 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ABatlC3u"; dkim-atps=neutral Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A634C6025B for ; Mon, 23 Aug 2021 14:43:31 +0200 (CEST) Received: by mail-pj1-x1030.google.com with SMTP id ot2-20020a17090b3b4200b0019127f8ed87so324328pjb.1 for ; Mon, 23 Aug 2021 05:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1aaEJ+CaN2f0E/lIGszK20309vFfqyGNu0O+eBZu6F8=; b=ABatlC3u4K9bOo+/2qFwLHryUelLxv2xf5qhKKVQpArif2HtXJ5rK8kBCBfZHZGOk9 peTR1t0v07kvG8CnI07SSfmpgqxLl9worxayORwwzbenWI2ctYBmQJDV9kQEyHKa96R/ 8x43tXpfSpViIdH1i17WbkY9HK0DoFh9SDjU8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1aaEJ+CaN2f0E/lIGszK20309vFfqyGNu0O+eBZu6F8=; b=PtdfAIIrHH5hY/RIngOtbl1B0mA58k3l4jLcahFPnMffNw4/f9nC8wkW/TljhRGviI wveRZklt2OicCfxCmplR83wT7xgSqXVHetJIFS7n0i8D28QOrgLa55np5yBiDmvWvKQO cdXtElbrgJ3Rtv4v6m0+MkF4Gm+CBmeA4NHwm9hcozuc8RV9KUJ8iGHaByr30d0f10E/ LUmI36enWqv+CYJDUi+sDrU7dok9MSNSSmc5UUpElwlsFiSYuQ+ZY9Thbe8qwA+2QGAq 7PX7CcEgXnZU3ItMzS4bNj6PP/gRJ5huki6ETYgcwK5ceor5zbtKDIPpPPfV0I8vlegt dn7g== X-Gm-Message-State: AOAM530os5n/kBy/Hna9PBvHjE0GXGEYKDxcfeWeRip0BMTb2IKb8EaQ LcSSo3lXYwSv17vt2axcu/rueC/vJKhApw== X-Google-Smtp-Source: ABdhPJyPIiLcwW5ZbbvBqS25BNkz43SuqLSsgJTZd/o4xClBflJREOcRF67OZUU3wS6oMlXzK0d7DQ== X-Received: by 2002:a17:90a:a78b:: with SMTP id f11mr4087176pjq.91.1629722610035; Mon, 23 Aug 2021 05:43:30 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:184e:5d20:8fcb:dfcd]) by smtp.gmail.com with ESMTPSA id o2sm12103107pgu.76.2021.08.23.05.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 05:43:29 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 23 Aug 2021 21:43:19 +0900 Message-Id: <20210823124321.980847-2-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog In-Reply-To: <20210823124321.980847-1-hiroh@chromium.org> References: <20210823124321.980847-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 1/3] android: generic_camera_buffer: Correct buffer mapping X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" buffer_hanlde_t doesn't provide sufficient info to map a buffer properly. cros::CameraBufferManager enables handling the buffer on ChromeOS, but no way is provided for other platforms. Therefore, we put the assumption that planes are in the same buffer and they are consecutive. This modifies the way of mapping in generic_camera_buffer with the assumption. Signed-off-by: Hirokazu Honda --- src/android/camera_buffer.h | 14 +++- src/android/camera_stream.cpp | 4 +- src/android/mm/cros_camera_buffer.cpp | 7 +- src/android/mm/generic_camera_buffer.cpp | 82 +++++++++++++++++------- 4 files changed, 78 insertions(+), 29 deletions(-) diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index c4e3a9e7..87df2570 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -11,13 +11,17 @@ #include #include +#include +#include class CameraBuffer final : public libcamera::Extensible { LIBCAMERA_DECLARE_PRIVATE() public: - CameraBuffer(buffer_handle_t camera3Buffer, int flags); + CameraBuffer(buffer_handle_t camera3Buffer, + libcamera::PixelFormat pixelFormat, + const libcamera::Size &size, int flags); ~CameraBuffer(); bool isValid() const; @@ -31,8 +35,12 @@ public: }; #define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION \ -CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) \ - : Extensible(std::make_unique(this, camera3Buffer, flags)) \ +CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, \ + libcamera::PixelFormat pixelFormat, \ + const libcamera::Size &size, int flags) \ + : Extensible(std::make_unique(this, camera3Buffer, \ + pixelFormat, size, \ + flags)) \ { \ } \ CameraBuffer::~CameraBuffer() \ diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 61b44183..01909ec7 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -110,7 +110,9 @@ int CameraStream::process(const libcamera::FrameBuffer &source, * \todo Buffer mapping and processing should be moved to a * separate thread. */ - CameraBuffer dest(camera3Dest, PROT_READ | PROT_WRITE); + const StreamConfiguration &output = configuration(); + CameraBuffer dest(camera3Dest, formats::MJPEG, output.size, + PROT_READ | PROT_WRITE); if (!dest.isValid()) { LOG(HAL, Error) << "Failed to map android blob buffer"; return -EINVAL; diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index e8783ff8..50732637 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -20,8 +20,9 @@ class CameraBuffer::Private : public Extensible::Private LIBCAMERA_DECLARE_PUBLIC(CameraBuffer) public: - Private(CameraBuffer *cameraBuffer, - buffer_handle_t camera3Buffer, int flags); + Private(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, + libcamera::PixelFormat pixelFormat, const libcamera::Size &size, + int flags); ~Private(); bool isValid() const { return valid_; } @@ -46,6 +47,8 @@ private: CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, + [[maybe_unused]] libcamera::PixelFormat pixelFormat, + [[maybe_unused]] const libcamera::Size &size, [[maybe_unused]] int flags) : handle_(camera3Buffer), numPlanes_(0), valid_(false), registered_(false) diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index b3af194c..3127069f 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -12,6 +12,7 @@ #include +#include "libcamera/internal/formats.h" #include "libcamera/internal/mapped_framebuffer.h" using namespace libcamera; @@ -24,8 +25,9 @@ class CameraBuffer::Private : public Extensible::Private, LIBCAMERA_DECLARE_PUBLIC(CameraBuffer) public: - Private(CameraBuffer *cameraBuffer, - buffer_handle_t camera3Buffer, int flags); + Private(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, + libcamera::PixelFormat pixelFormat, const libcamera::Size &size, + int flags); ~Private(); unsigned int numPlanes() const; @@ -33,35 +35,69 @@ public: Span plane(unsigned int plane); size_t jpegBufferSize(size_t maxJpegBufferSize) const; + +private: + /* \todo remove planes_ is added to MappedBuffer. */ + std::vector> planes_; }; CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, - buffer_handle_t camera3Buffer, int flags) + buffer_handle_t camera3Buffer, + libcamera::PixelFormat pixelFormat, + const libcamera::Size &size, int flags) { - maps_.reserve(camera3Buffer->numFds); error_ = 0; + int fd = -1; for (int i = 0; i < camera3Buffer->numFds; i++) { - if (camera3Buffer->data[i] == -1) - continue; - - off_t length = lseek(camera3Buffer->data[i], 0, SEEK_END); - if (length < 0) { - error_ = -errno; - LOG(HAL, Error) << "Failed to query plane length"; + if (camera3Buffer->data[i] != -1) { + fd = camera3Buffer->data[i]; break; } + } - void *address = mmap(nullptr, length, flags, MAP_SHARED, - camera3Buffer->data[i], 0); - if (address == MAP_FAILED) { - error_ = -errno; - LOG(HAL, Error) << "Failed to mmap plane"; - break; - } + if (fd != -1) { + error_ = EINVAL; + LOG(HAL, Error) << "No valid file descriptor"; + return; + } + + const auto &info = libcamera::PixelFormatInfo::info(pixelFormat); + if (!info.isValid()) { + error_ = EINVAL; + LOG(HAL, Error) << "Invalid pixel format: " + << pixelFormat.toString(); + return; + } + + size_t bufferLength = lseek(fd, 0, SEEK_END); + if (bufferLength < 0) { + error_ = -errno; + LOG(HAL, Error) << "Failed to get buffer length"; + return; + } + + void *address = mmap(nullptr, bufferLength, flags, MAP_SHARED, fd, 0); + if (address == MAP_FAILED) { + error_ = -errno; + LOG(HAL, Error) << "Failed to mmap plane"; + return; + } + maps_.emplace_back(static_cast(address), bufferLength); + + const unsigned int numPlanes = info.numPlanes(); + planes_.resize(numPlanes); + unsigned int offset = 0; + for (unsigned int i = 0; i < numPlanes; ++i) { + const unsigned int vertSubSample = info.planes[i].verticalSubSampling; + const unsigned int stride = info.stride(size.width, i, 1u); + const unsigned int planeSize = + stride * ((size.height + vertSubSample - 1) / vertSubSample); + + planes_[i] = libcamera::Span( + static_cast(address) + offset, planeSize); - maps_.emplace_back(static_cast(address), - static_cast(length)); + offset += planeSize; } } @@ -71,15 +107,15 @@ CameraBuffer::Private::~Private() unsigned int CameraBuffer::Private::numPlanes() const { - return maps_.size(); + return planes_.size(); } Span CameraBuffer::Private::plane(unsigned int plane) { - if (plane >= maps_.size()) + if (plane >= planes_.size()) return {}; - return maps_[plane]; + return planes_[plane]; } size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const From patchwork Mon Aug 23 12:43:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 13433 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C7133BD87C for ; Mon, 23 Aug 2021 12:43:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 87FBF688A3; Mon, 23 Aug 2021 14:43:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="OHAzmt/9"; dkim-atps=neutral Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D755A688AC for ; Mon, 23 Aug 2021 14:43:33 +0200 (CEST) Received: by mail-pl1-x630.google.com with SMTP id a5so10085005plh.5 for ; Mon, 23 Aug 2021 05:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PLLR3hebxfmwGxx8ycAFSj/gcCJJAYskwcHt/K1rz+A=; b=OHAzmt/9FHPLTq89oNoqLxdsXBgShcs6e1R1Qmgp2eVO5hPI3EjOFzUBELLgj1qWXR h9GK26OaI/cveEhEdkwzs0eF7z4vTvylfj/Id5qez7AcDLtUScgI2p8z7wHZzTQgTlha 7HatFI0Ti8AQiXfKYEIhzTuow+5efueukjAYk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PLLR3hebxfmwGxx8ycAFSj/gcCJJAYskwcHt/K1rz+A=; b=dkb/G7cAYD9nS94vm/aeDtqzTJipA6rAG8tmBGcwwi84b3WBHu823g9HPhx7cAFAHn Tbldywr7z3ihW+3JVCuu8Fsz1Ipcnm74YHN/twy2VFgVDaIst4rZuaMov1GWBmoYzJ9M N8zP2BYtMmotR70l0gO86osqTC4FZhZJKjMwuPi8dj2CjoKCsJz+aGW3yJSJmA8/U3Y4 yJzsNoeXrQSXiFokRt9xdJBGgi4AuMbqHy5QuiVL3tzxLJBzsrJU64IfyrTL9kKuClRl HDoOsCkmdkN8XTth6Lh42ZPFjh/AfpMdOCw9exgn2YSHw2LrfL74IOrmYVDlSHARaNqj wOeg== X-Gm-Message-State: AOAM530Sk17bdPQFpD56ePkT4EAmKXjiIT0p2OO6OvkslUBuPmMHhFIt 25CkdaFSjxhIcQwDlBEzQqvZURybqgbZdA== X-Google-Smtp-Source: ABdhPJxXAw+hyvYmzO2L8DGJ0B1h6tu1k5q0Xiesq2C5/qugtXoXjze6x/UHhhPGWINdum45FNitPA== X-Received: by 2002:a17:902:8346:b0:131:bb78:7a9e with SMTP id z6-20020a170902834600b00131bb787a9emr12404997pln.28.1629722611831; Mon, 23 Aug 2021 05:43:31 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:184e:5d20:8fcb:dfcd]) by smtp.gmail.com with ESMTPSA id o2sm12103107pgu.76.2021.08.23.05.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 05:43:31 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 23 Aug 2021 21:43:20 +0900 Message-Id: <20210823124321.980847-3-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog In-Reply-To: <20210823124321.980847-1-hiroh@chromium.org> References: <20210823124321.980847-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 2/3] android: camera_buffer: Map buffer in the first plane() call X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" CameraBuffer implementation maps a given buffer_handle_t in constructor. Mapping is redundant to only know the plane info like stride and offset. Mapping should be executed rater in the first plane() call. Signed-off-by: Hirokazu Honda --- src/android/mm/cros_camera_buffer.cpp | 71 ++++++++++-------- src/android/mm/generic_camera_buffer.cpp | 93 +++++++++++++++--------- 2 files changed, 100 insertions(+), 64 deletions(-) diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index 50732637..85ef6480 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -25,7 +25,7 @@ public: int flags); ~Private(); - bool isValid() const { return valid_; } + bool isValid() const { return registered_; } unsigned int numPlanes() const; @@ -34,10 +34,12 @@ public: size_t jpegBufferSize(size_t maxJpegBufferSize) const; private: + bool Map(); + cros::CameraBufferManager *bufferManager_; buffer_handle_t handle_; unsigned int numPlanes_; - bool valid_; + bool mapped_; bool registered_; union { void *addr; @@ -50,7 +52,7 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, [[maybe_unused]] libcamera::PixelFormat pixelFormat, [[maybe_unused]] const libcamera::Size &size, [[maybe_unused]] int flags) - : handle_(camera3Buffer), numPlanes_(0), valid_(false), + : handle_(camera3Buffer), numPlanes_(0), mapped_(false), registered_(false) { bufferManager_ = cros::CameraBufferManager::GetInstance(); @@ -63,36 +65,11 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, registered_ = true; numPlanes_ = bufferManager_->GetNumPlanes(camera3Buffer); - switch (numPlanes_) { - case 1: { - ret = bufferManager_->Lock(handle_, 0, 0, 0, 0, 0, &mem.addr); - if (ret) { - LOG(HAL, Error) << "Single plane buffer mapping failed"; - return; - } - break; - } - case 2: - case 3: { - ret = bufferManager_->LockYCbCr(handle_, 0, 0, 0, 0, 0, - &mem.ycbcr); - if (ret) { - LOG(HAL, Error) << "YCbCr buffer mapping failed"; - return; - } - break; - } - default: - LOG(HAL, Error) << "Invalid number of planes: " << numPlanes_; - return; - } - - valid_ = true; } CameraBuffer::Private::~Private() { - if (valid_) + if (mapped_) bufferManager_->Unlock(handle_); if (registered_) bufferManager_->Deregister(handle_); @@ -105,6 +82,12 @@ unsigned int CameraBuffer::Private::numPlanes() const Span CameraBuffer::Private::plane(unsigned int plane) { + if (!mapped_) { + mapped_ = Map(); + if (!mapped_) + return {}; + } + void *addr; switch (numPlanes()) { @@ -134,4 +117,34 @@ size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t maxJpegBuff return bufferManager_->GetPlaneSize(handle_, 0); } +bool CameraBuffer::Private::Map() +{ + int ret; + switch (numPlanes_) { + case 1: { + ret = bufferManager_->Lock(handle_, 0, 0, 0, 0, 0, &mem.addr); + if (ret) { + LOG(HAL, Error) << "Single plane buffer mapping failed"; + return false; + } + break; + } + case 2: + case 3: { + ret = bufferManager_->LockYCbCr(handle_, 0, 0, 0, 0, 0, + &mem.ycbcr); + if (ret) { + LOG(HAL, Error) << "YCbCr buffer mapping failed"; + return false; + } + break; + } + default: + LOG(HAL, Error) << "Invalid number of planes: " << numPlanes_; + return false; + } + + return true; +} + PUBLIC_CAMERA_BUFFER_IMPLEMENTATION diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index 3127069f..6c1e4611 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -37,6 +37,12 @@ public: size_t jpegBufferSize(size_t maxJpegBufferSize) const; private: + bool Map(); + + int fd_; + int flags_; + libcamera::Size size_; + libcamera::PixelFormatInfo info_; /* \todo remove planes_ is added to MappedBuffer. */ std::vector> planes_; }; @@ -45,83 +51,100 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, libcamera::PixelFormat pixelFormat, const libcamera::Size &size, int flags) + : fd_(-1), flags_(flags), size_(size) { error_ = 0; - int fd = -1; for (int i = 0; i < camera3Buffer->numFds; i++) { if (camera3Buffer->data[i] != -1) { - fd = camera3Buffer->data[i]; + fd_ = camera3Buffer->data[i]; break; } } - if (fd != -1) { + if (fd_ != -1) { error_ = EINVAL; LOG(HAL, Error) << "No valid file descriptor"; return; } - const auto &info = libcamera::PixelFormatInfo::info(pixelFormat); - if (!info.isValid()) { + info_ = libcamera::PixelFormatInfo::info(pixelFormat); + if (!info_.isValid()) { error_ = EINVAL; LOG(HAL, Error) << "Invalid pixel format: " << pixelFormat.toString(); return; } +} + +CameraBuffer::Private::~Private() +{ +} + +unsigned int CameraBuffer::Private::numPlanes() const +{ + return info_.numPlanes(); +} + +Span CameraBuffer::Private::plane(unsigned int plane) +{ + if (planes_.empty() && !Map()) + return {}; - size_t bufferLength = lseek(fd, 0, SEEK_END); + if (plane >= planes_.size()) + return {}; + + return planes_[plane]; +} + +size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const +{ + if (maps_.empty()) { + size_t bufferLength = lseek(fd_, 0, SEEK_END); + if (bufferLength < 0) + LOG(HAL, Error) << "Failed to get buffer length"; + return 0; + } + + return std::min(maps_[0].size(), + maxJpegBufferSize); +} + +bool CameraBuffer::Private::Map() +{ + ASSERT(fd_ != -1); + + size_t bufferLength = lseek(fd_, 0, SEEK_END); if (bufferLength < 0) { error_ = -errno; LOG(HAL, Error) << "Failed to get buffer length"; - return; + return false; } - void *address = mmap(nullptr, bufferLength, flags, MAP_SHARED, fd, 0); + void *address = mmap(nullptr, bufferLength, flags_, MAP_SHARED, fd_, 0); if (address == MAP_FAILED) { error_ = -errno; LOG(HAL, Error) << "Failed to mmap plane"; - return; + return false; } maps_.emplace_back(static_cast(address), bufferLength); - const unsigned int numPlanes = info.numPlanes(); + const unsigned int numPlanes = info_.numPlanes(); planes_.resize(numPlanes); unsigned int offset = 0; for (unsigned int i = 0; i < numPlanes; ++i) { - const unsigned int vertSubSample = info.planes[i].verticalSubSampling; - const unsigned int stride = info.stride(size.width, i, 1u); + const unsigned int vertSubSample = info_.planes[i].verticalSubSampling; + const unsigned int stride = info_.stride(size_.width, i, 1u); const unsigned int planeSize = - stride * ((size.height + vertSubSample - 1) / vertSubSample); + stride * ((size_.height + vertSubSample - 1) / vertSubSample); planes_[i] = libcamera::Span( static_cast(address) + offset, planeSize); offset += planeSize; } -} - -CameraBuffer::Private::~Private() -{ -} - -unsigned int CameraBuffer::Private::numPlanes() const -{ - return planes_.size(); -} -Span CameraBuffer::Private::plane(unsigned int plane) -{ - if (plane >= planes_.size()) - return {}; - - return planes_[plane]; -} - -size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const -{ - return std::min(maps_[0].size(), - maxJpegBufferSize); + return true; } PUBLIC_CAMERA_BUFFER_IMPLEMENTATION From patchwork Mon Aug 23 12:43:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 13434 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 39009C3241 for ; Mon, 23 Aug 2021 12:43:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E7C316890E; Mon, 23 Aug 2021 14:43:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VdAQcMMY"; dkim-atps=neutral Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6F06D6025B for ; Mon, 23 Aug 2021 14:43:35 +0200 (CEST) Received: by mail-pf1-x42f.google.com with SMTP id y190so15286762pfg.7 for ; Mon, 23 Aug 2021 05:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bFCbYAuFJwWL8413qwL1JI4tS02tPRRVoLn2/nC3Hec=; b=VdAQcMMYjTxiGmQwhK6MrB0K5HslBCp69n7O1FdEcS5axywWAqzgGg0tK62QyvdBoJ KjtBCkeLU2u/aM1XuQkZf/IuAmsWOpxPQKT/te7nu1NocXuev2Re+0DlULYn1hySIkY9 kFr9lydwOjePO1l8qOn5OxT1oZE6iahx3G66E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bFCbYAuFJwWL8413qwL1JI4tS02tPRRVoLn2/nC3Hec=; b=BCj9B0sfAy4bKvO44R87XmhscxpKXvfsTdxOtdUlDZJyUqTRET5jPrGIOeTljmLUix oDPUbZAJmRsAj2+ywWlaJiqtNDnDMIXVmR1m9KvjNtOLHKbW0uPcxcqdmRI5AGe1PiAW n6sdThGwapFbBzU3K9gPSVFjV7ELNj3vEtKhyK9KLZPNvl0OcNjP5ysEWp/dxi20qDz7 Rx3Iz1ub77vUn5z6Gj74y+/0PYlNxnTE41n9UlWEDCqNwxGb8b5WYXa7yHUXsByqcVa7 e0AZrl2aN4vCUNi1qWy94ASDzZnfyqICUO8GuFxr8eWyHWdYx03mY5valOt+723GfXdy A3oQ== X-Gm-Message-State: AOAM532CwEkAbX3k1s1Sp7IuFSAHKJzOdStUuvn1BBlLttNq4pDXwHwR rp3oU+OSRvZeCYQpwMo+QJ+sMlS1hI2a6w== X-Google-Smtp-Source: ABdhPJyd2jwFNhySd+duRoEGJzMm9NrPh2jKYBqeUBChMgN5xLOb1xguY/4dJzZedSreghY1pN1DWg== X-Received: by 2002:aa7:8c19:0:b0:3e1:4b9e:cf89 with SMTP id c25-20020aa78c19000000b003e14b9ecf89mr34049582pfd.58.1629722613647; Mon, 23 Aug 2021 05:43:33 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:184e:5d20:8fcb:dfcd]) by smtp.gmail.com with ESMTPSA id o2sm12103107pgu.76.2021.08.23.05.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 05:43:33 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 23 Aug 2021 21:43:21 +0900 Message-Id: <20210823124321.980847-4-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog In-Reply-To: <20210823124321.980847-1-hiroh@chromium.org> References: <20210823124321.980847-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 3/3] android: camera_buffer: Add stride/offset/size function X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This adds getter functions of stride, offset and size to CameraBuffer interface. Signed-off-by: Hirokazu Honda --- src/android/camera_buffer.h | 16 +++++ src/android/mm/cros_camera_buffer.cpp | 19 ++++++ src/android/mm/generic_camera_buffer.cpp | 78 ++++++++++++++++++------ 3 files changed, 94 insertions(+), 19 deletions(-) diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index 87df2570..226a8f5c 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -31,6 +31,10 @@ public: libcamera::Span plane(unsigned int plane) const; libcamera::Span plane(unsigned int plane); + unsigned int stride(unsigned int plane) const; + unsigned int offset(unsigned int plane) const; + unsigned int size(unsigned int plane) const; + size_t jpegBufferSize(size_t maxJpegBufferSize) const; }; @@ -62,6 +66,18 @@ Span CameraBuffer::plane(unsigned int plane) \ { \ return _d()->plane(plane); \ } \ +unsigned int CameraBuffer::stride(unsigned int plane) const \ +{ \ + return _d()->stride(plane); \ +} \ +unsigned int CameraBuffer::offset(unsigned int plane) const \ +{ \ + return _d()->offset(plane); \ +} \ +unsigned int CameraBuffer::size(unsigned int plane) const \ +{ \ + return _d()->size(plane); \ +} \ size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const \ { \ return _d()->jpegBufferSize(maxJpegBufferSize); \ diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index 85ef6480..4ba24f79 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -31,6 +31,10 @@ public: Span plane(unsigned int plane); + unsigned int stride(unsigned int plane) const; + unsigned int offset(unsigned int plane) const; + unsigned int size(unsigned int plane) const; + size_t jpegBufferSize(size_t maxJpegBufferSize) const; private: @@ -112,6 +116,21 @@ Span CameraBuffer::Private::plane(unsigned int plane) bufferManager_->GetPlaneSize(handle_, plane) }; } +unsigned int CameraBuffer::Private::stride(unsigned int plane) const +{ + return cros::CameraBufferManager::GetPlaneStride(handle_, plane); +} + +unsigned int CameraBuffer::Private::offset(unsigned int plane) const +{ + return cros::CameraBufferManager::GetPlaneOffset(handle_, plane); +} + +unsigned int CameraBuffer::Private::size(unsigned int plane) const +{ + return cros::CameraBufferManager::GetPlaneSize(handle_, plane); +} + size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t maxJpegBufferSize) const { return bufferManager_->GetPlaneSize(handle_, 0); diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index 6c1e4611..b296b3e3 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -34,15 +34,24 @@ public: Span plane(unsigned int plane); + unsigned int stride(unsigned int plane) const; + unsigned int offset(unsigned int plane) const; + unsigned int size(unsigned int plane) const; + size_t jpegBufferSize(size_t maxJpegBufferSize) const; private: + struct PlaneInfo { + unsigned int stride; + unsigned int offset; + unsigned int size; + }; + bool Map(); int fd_; int flags_; - libcamera::Size size_; - libcamera::PixelFormatInfo info_; + std::vector planeInfo_; /* \todo remove planes_ is added to MappedBuffer. */ std::vector> planes_; }; @@ -51,7 +60,7 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, libcamera::PixelFormat pixelFormat, const libcamera::Size &size, int flags) - : fd_(-1), flags_(flags), size_(size) + : fd_(-1), flags_(flags) { error_ = 0; @@ -68,13 +77,29 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, return; } - info_ = libcamera::PixelFormatInfo::info(pixelFormat); - if (!info_.isValid()) { + const auto &info = libcamera::PixelFormatInfo::info(pixelFormat); + if (!info.isValid()) { error_ = EINVAL; LOG(HAL, Error) << "Invalid pixel format: " << pixelFormat.toString(); return; } + + const unsigned int numPlanes = info.numPlanes(); + planeInfo_.resize(numPlanes); + unsigned int offset = 0; + for (unsigned int i = 0; i < numPlanes; ++i) { + const unsigned int vertSubSample = info.planes[i].verticalSubSampling; + const unsigned int stride = info.stride(size.width, i, 1u); + const unsigned int planeSize = + stride * ((size.height + vertSubSample - 1) / vertSubSample); + + planeInfo_[i].stride = stride; + planeInfo_[i].offset = offset; + planeInfo_[i].size = planeSize; + + offset += planeSize; + } } CameraBuffer::Private::~Private() @@ -83,7 +108,7 @@ CameraBuffer::Private::~Private() unsigned int CameraBuffer::Private::numPlanes() const { - return info_.numPlanes(); + return planeInfo_.size(); } Span CameraBuffer::Private::plane(unsigned int plane) @@ -97,6 +122,30 @@ Span CameraBuffer::Private::plane(unsigned int plane) return planes_[plane]; } +unsigned int CameraBuffer::Private::stride(unsigned int plane) const +{ + if (plane >= planeInfo_.size()) + return 0; + + return planeInfo_[plane].stride; +} + +unsigned int CameraBuffer::Private::offset(unsigned int plane) const +{ + if (plane >= planeInfo_.size()) + return 0; + + return planeInfo_[plane].offset; +} + +unsigned int CameraBuffer::Private::size(unsigned int plane) const +{ + if (plane >= planeInfo_.size()) + return 0; + + return planeInfo_[plane].size; +} + size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const { if (maps_.empty()) { @@ -129,19 +178,10 @@ bool CameraBuffer::Private::Map() } maps_.emplace_back(static_cast(address), bufferLength); - const unsigned int numPlanes = info_.numPlanes(); - planes_.resize(numPlanes); - unsigned int offset = 0; - for (unsigned int i = 0; i < numPlanes; ++i) { - const unsigned int vertSubSample = info_.planes[i].verticalSubSampling; - const unsigned int stride = info_.stride(size_.width, i, 1u); - const unsigned int planeSize = - stride * ((size_.height + vertSubSample - 1) / vertSubSample); - - planes_[i] = libcamera::Span( - static_cast(address) + offset, planeSize); - - offset += planeSize; + planes_.reserve(planeInfo_.size()); + for (const auto &info : planeInfo_) { + planes_.emplace_back( + static_cast(address) + info.offset, info.size); } return true;