From patchwork Thu Aug 26 08:00: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: 13498 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 59ABBBD87C for ; Thu, 26 Aug 2021 08:00:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 21D7E68911; Thu, 26 Aug 2021 10:00:35 +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="i5T+Mon+"; dkim-atps=neutral Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AC045688C4 for ; Thu, 26 Aug 2021 10:00:31 +0200 (CEST) Received: by mail-pg1-x52e.google.com with SMTP id n18so2376011pgm.12 for ; Thu, 26 Aug 2021 01:00: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=u+h2oOWzEIeI2WME3h5R0OSUyW5I4nshv74ofZZm5G4=; b=i5T+Mon+bPE97Cm1VEIJB0lSEExQJ2bHL8VTSPzDEVmKd0fitZ1Y+5Q0IegrCOHCNb 409NRQQ1u0/jYIssoubpyzVY9kk6H3DSXU03aJg9LwFQD5rJSNuRO3Fblp/0Qb41wAkl dopNmDviWG9BcLQ00EeeP+T2v1jFauBuXXNtA= 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=u+h2oOWzEIeI2WME3h5R0OSUyW5I4nshv74ofZZm5G4=; b=eBBEx/ooXeHxpLK63FB8X+ilvBqqi0XyChMgMMLOK496I5kguvp+NDESNfKB2ujTk7 FXn1Vgbm33DazpEdftJlv97VjxXcDsP+X+5XehPwUG4y1svUpr0UWC16SyWHaNEn/K+w HWtHjiXRqIcfxZDcy497AR1Sr0+6b/uEIVffY+r3Y0j72g1YPwmPS5IcJdKlYmxKKQhX il9JWTJ8syysP6UJv4PqNKDQykLxYmueBnETlE4aZCKwj4kxOgkz1fpo5/dltM7NBBXD GMUkmhxxrCG/zHoturQndAV6H5kfCNgSCscn+twkRxdh4i95trNn1QuTG3kkxljgNVPJ 1vbQ== X-Gm-Message-State: AOAM532b0gQWOKpzjK0ORDUjOqGEqxj7Nb8sJvvgrjcg25sBD6kmf0S5 zT59nz89uk/ku7vqOEmrsUklXItPjLkftw== X-Google-Smtp-Source: ABdhPJw5hDuMUARR1Gx4nSzt9kpMUXwWR80pU1+bF+CSDHUSElveT8MzHrTB9KOAZSYWe+3JqVDHuw== X-Received: by 2002:a63:1247:: with SMTP id 7mr2261483pgs.366.1629964829457; Thu, 26 Aug 2021 01:00:29 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:a5bc:b3dd:7208:bec1]) by smtp.gmail.com with ESMTPSA id g3sm2570805pgj.66.2021.08.26.01.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 01:00:29 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Thu, 26 Aug 2021 17:00:19 +0900 Message-Id: <20210826080021.3454520-2-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog In-Reply-To: <20210826080021.3454520-1-hiroh@chromium.org> References: <20210826080021.3454520-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 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_handle_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 Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- 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 | 103 ++++++++++++++++++----- 4 files changed, 100 insertions(+), 28 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..22753490 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,92 @@ public: Span plane(unsigned int plane); size_t jpegBufferSize(size_t maxJpegBufferSize) const; + +private: + /* \todo Remove planes_ when it will be 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; + const auto &info = libcamera::PixelFormatInfo::info(pixelFormat); + if (!info.isValid()) { + error_ = -EINVAL; + LOG(HAL, Error) << "Invalid pixel format: " + << pixelFormat.toString(); + return; + } + + /* + * As Android doesn't offer an API to query buffer layouts, assume for + * now that the buffer is backed by a single dmabuf, with planes being + * stored contiguously. + */ + int fd = -1; for (int i = 0; i < camera3Buffer->numFds; i++) { - if (camera3Buffer->data[i] == -1) + if (camera3Buffer->data[i] == -1 || camera3Buffer->data[i] == fd) continue; - off_t length = lseek(camera3Buffer->data[i], 0, SEEK_END); - if (length < 0) { - error_ = -errno; - LOG(HAL, Error) << "Failed to query plane length"; - break; + if (fd != -1) { + error_ = -EINVAL; + LOG(HAL, Error) << "Discontiguous planes are not supported"; + return; } - 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; - } + fd = camera3Buffer->data[i]; + } - maps_.emplace_back(static_cast(address), - static_cast(length)); + if (fd == -1) { + error_ = -EINVAL; + LOG(HAL, Error) << "No valid file descriptor"; + return; + } + + off_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) { + /* + * \todo Remove if this plane size computation function is + * added to PixelFormatInfo. + */ + 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); + + if (bufferLength < offset + planeSize) { + error_ = -EINVAL; + LOG(HAL, Error) << "Plane " << i << " is out of buffer" + << ", buffer length=" << bufferLength + << ", offset=" << offset + << ", size=" << planeSize; + return; + } + offset += planeSize; } } @@ -71,15 +130,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 Thu Aug 26 08:00: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: 13499 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 05830C3241 for ; Thu, 26 Aug 2021 08:00:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9BC216891A; Thu, 26 Aug 2021 10:00:35 +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="K0yN/I9P"; dkim-atps=neutral Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1075C688AC for ; Thu, 26 Aug 2021 10:00:33 +0200 (CEST) Received: by mail-pf1-x430.google.com with SMTP id r13so1677192pff.7 for ; Thu, 26 Aug 2021 01:00:32 -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=KFMQKfJhtjmZS1LVznkULl8g1sD+PYxZXq14LjoblVk=; b=K0yN/I9PNEPw5W+c/HtTZpgylqOg9/tzfqkauUPQdn37+zdZ0SWyhIyD8BjzvoBvFk X+NEbWGP+GlxueftGvWXXy5wVZAK0JSylObYvYYozMqo2MU6DO9730om4VCMesYoa65R 88c+2Bo/QC4LccMKyhuj+pyNxbI5v0QVrGHSY= 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=KFMQKfJhtjmZS1LVznkULl8g1sD+PYxZXq14LjoblVk=; b=p0y+FvsViU14UUOVArrbiy228QoUNpHfnq5yaBNY15w5zoJGkI/epnogWGFAzo0P/I khhj/aEsYT4+ZCQS2HgPhXqU+knPNt4TliPUhQDhIrWLbesUDy/gP021wC4EVB3U0Kks aHTZdqE5xg3MlirIYU1egrsvNoyvjA2aXCnoCtxxWa6rF/emQohJ5Oowwf63ZV0DejEA GzFuBuhYx7Sq92DRxTalxzadICgAvF02faLxn413ZMSrFcMG83HFQ1u+JDCO1oN09DW8 QNvw1HviuqNdMGISD1KL7whyV6r8jrlaRjbxFXmS7Feb9969jnEwoG/n8z1xNhSSCyTX Sn1w== X-Gm-Message-State: AOAM533hhumg4aMX9yJNsoXWNlTxUInC2I2/e7GGqq/apYyyDR9j6ZL0 lbcr+MgkqDJ6a+eyYiyEQMDV/oiayS7cCA== X-Google-Smtp-Source: ABdhPJxWR6jaUIFF0a3sTSTweMH6HWmQTDWq3BHVPMTXvYcgArgjFW1ciD2R8zyfxwN471wSLg2Unw== X-Received: by 2002:a63:134e:: with SMTP id 14mr2233600pgt.312.1629964831286; Thu, 26 Aug 2021 01:00:31 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:a5bc:b3dd:7208:bec1]) by smtp.gmail.com with ESMTPSA id g3sm2570805pgj.66.2021.08.26.01.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 01:00:30 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Thu, 26 Aug 2021 17:00:20 +0900 Message-Id: <20210826080021.3454520-3-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog In-Reply-To: <20210826080021.3454520-1-hiroh@chromium.org> References: <20210826080021.3454520-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 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 Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/mm/cros_camera_buffer.cpp | 71 +++++++++++-------- src/android/mm/generic_camera_buffer.cpp | 86 ++++++++++++++++-------- 2 files changed, 100 insertions(+), 57 deletions(-) diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index 50732637..ba6650cf 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: + void 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,11 @@ unsigned int CameraBuffer::Private::numPlanes() const Span CameraBuffer::Private::plane(unsigned int plane) { + if (!mapped_) + map(); + if (!mapped_) + return {}; + void *addr; switch (numPlanes()) { @@ -134,4 +116,35 @@ size_t CameraBuffer::Private::jpegBufferSize([[maybe_unused]] size_t maxJpegBuff return bufferManager_->GetPlaneSize(handle_, 0); } +void 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; + } + 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; + } + + mapped_ = true; + return; +} + PUBLIC_CAMERA_BUFFER_IMPLEMENTATION diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index 22753490..cfe55b69 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -37,6 +37,18 @@ public: size_t jpegBufferSize(size_t maxJpegBufferSize) const; private: + struct PlaneInfo { + unsigned int offset; + unsigned int size; + }; + + void map(); + + int fd_; + int flags_; + off_t bufferLength_; + bool mapped_; + std::vector planeInfo_; /* \todo Remove planes_ when it will be added to MappedBuffer */ std::vector> planes_; }; @@ -45,6 +57,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), mapped_(false) { error_ = 0; @@ -61,43 +74,35 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, * now that the buffer is backed by a single dmabuf, with planes being * stored contiguously. */ - int fd = -1; for (int i = 0; i < camera3Buffer->numFds; i++) { - if (camera3Buffer->data[i] == -1 || camera3Buffer->data[i] == fd) + if (camera3Buffer->data[i] == -1 || camera3Buffer->data[i] == fd_) continue; - if (fd != -1) { + if (fd_ != -1) { error_ = -EINVAL; LOG(HAL, Error) << "Discontiguous planes are not supported"; return; } - fd = camera3Buffer->data[i]; + fd_ = camera3Buffer->data[i]; } - if (fd == -1) { + if (fd_ == -1) { error_ = -EINVAL; LOG(HAL, Error) << "No valid file descriptor"; return; } - off_t bufferLength = lseek(fd, 0, SEEK_END); - if (bufferLength < 0) { + 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); + planeInfo_.resize(numPlanes); + unsigned int offset = 0; for (unsigned int i = 0; i < numPlanes; ++i) { /* @@ -109,17 +114,17 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, const unsigned int planeSize = stride * ((size.height + vertSubSample - 1) / vertSubSample); - planes_[i] = libcamera::Span( - static_cast(address) + offset, planeSize); + planeInfo_[i].offset = offset; + planeInfo_[i].size = planeSize; - if (bufferLength < offset + planeSize) { - error_ = -EINVAL; - LOG(HAL, Error) << "Plane " << i << " is out of buffer" - << ", buffer length=" << bufferLength - << ", offset=" << offset - << ", size=" << planeSize; + if (bufferLength_ < offset + planeSize) { + LOG(HAL, Error) << "Plane " << i << " is out of buffer:" + << " plane offset=" << offset + << ", plane size=" << planeSize + << ", buffer length=" << bufferLength_; return; } + offset += planeSize; } } @@ -130,12 +135,14 @@ CameraBuffer::Private::~Private() unsigned int CameraBuffer::Private::numPlanes() const { - return planes_.size(); + return planeInfo_.size(); } Span CameraBuffer::Private::plane(unsigned int plane) { - if (plane >= planes_.size()) + if (!mapped_) + map(); + if (!mapped_) return {}; return planes_[plane]; @@ -143,8 +150,31 @@ Span CameraBuffer::Private::plane(unsigned int plane) size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const { - return std::min(maps_[0].size(), - maxJpegBufferSize); + ASSERT(bufferLength_ >= 0); + + return std::min(bufferLength_, maxJpegBufferSize); +} + +void CameraBuffer::Private::map() +{ + ASSERT(fd_ != -1); + ASSERT(bufferLength_ >= 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; + } + maps_.emplace_back(static_cast(address), bufferLength_); + + planes_.reserve(planeInfo_.size()); + for (const auto &info : planeInfo_) { + planes_.emplace_back( + static_cast(address) + info.offset, info.size); + } + + mapped_ = true; } PUBLIC_CAMERA_BUFFER_IMPLEMENTATION From patchwork Thu Aug 26 08:00: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: 13500 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 0A97FBD87C for ; Thu, 26 Aug 2021 08:00:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B95DD688A3; Thu, 26 Aug 2021 10:00:38 +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="YS5oVT3v"; dkim-atps=neutral Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 813D368919 for ; Thu, 26 Aug 2021 10:00:35 +0200 (CEST) Received: by mail-pl1-x631.google.com with SMTP id q3so1312519plx.4 for ; Thu, 26 Aug 2021 01:00: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=yGO7hdszu0loHkLXpQ+gtTaw/bY/r+07vfYg6W0bFDY=; b=YS5oVT3vzpcIZr+FYXze0Yy/Px47K0YYpF3QmDGAlxPdYceXoZZ5GgVkxNz5Nww46o KKIT79x7G1Glv9kcCcCSJZHPUx7kZWyUcIIDp/ICLHPq0HPmfHfSKJIgwK9h1Z6zX7P3 kBb1g8SQMoNhSQ0Pes2dsJAgIeIRX4dznezh8= 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=yGO7hdszu0loHkLXpQ+gtTaw/bY/r+07vfYg6W0bFDY=; b=JWqxl5jixl5U+V4S2BNuVcp/JbYG+/Ux7Y5Mj+aKCD5H7A3veE+1rhtZJ80KAU8UGQ t0gFE80xc8ElMDxM+TXtVQZJFEVtC2D1s4iS454aR563MzkshKSutwq3jn50LjZUFYwD sC3fZXDnQlag50hJLKAf8+/dyrAOZM1K5hEVfjtfMLR8s0qjKttXb3lax8EkmM/eAX1b T6qBSTNdmKnZqNRhnYNyrI0PHRfU84kFy1vT1gnImNsthLC1cmJTxMkSYwmvhZdupX/5 0+dmQCU7nJGj9p+vV+wuGdSkDJv2LgrOEXa6J0BeGIQETWE74kFUB7YrvW8ee2tWUOCk pYeg== X-Gm-Message-State: AOAM5329TFvXC9XyU5sWZ2ByHdlDJuKWCR/wL2GE7JXrnoixP7x8Xj4l Xu2AqourHRj73vK0BdQ1krPR+TM/CU46Ow== X-Google-Smtp-Source: ABdhPJwOjL9HFA5EiPsvGhgWoTWiAMcGhKRu3bu2F42JHwGoP4Afmkqp4KHY/GkhR6DqUgBXzaCkNA== X-Received: by 2002:a17:902:bf4c:b0:137:b460:1349 with SMTP id u12-20020a170902bf4c00b00137b4601349mr2487503pls.23.1629964833171; Thu, 26 Aug 2021 01:00:33 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:a5bc:b3dd:7208:bec1]) by smtp.gmail.com with ESMTPSA id g3sm2570805pgj.66.2021.08.26.01.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 01:00:32 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Thu, 26 Aug 2021 17:00:21 +0900 Message-Id: <20210826080021.3454520-4-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog In-Reply-To: <20210826080021.3454520-1-hiroh@chromium.org> References: <20210826080021.3454520-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 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 Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/camera_buffer.h | 16 +++++++++++++ src/android/mm/cros_camera_buffer.cpp | 19 +++++++++++++++ src/android/mm/generic_camera_buffer.cpp | 30 ++++++++++++++++++++++++ 3 files changed, 65 insertions(+) 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 ba6650cf..44993379 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: @@ -111,6 +115,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 cfe55b69..4f0a3207 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -34,10 +34,15 @@ 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; }; @@ -114,6 +119,7 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, const unsigned int planeSize = stride * ((size.height + vertSubSample - 1) / vertSubSample); + planeInfo_[i].stride = stride; planeInfo_[i].offset = offset; planeInfo_[i].size = planeSize; @@ -148,6 +154,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 { ASSERT(bufferLength_ >= 0);