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