From patchwork Mon Sep 27 10:48: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: 13945 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 1163CC3243 for ; Mon, 27 Sep 2021 10:48:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CE93969196; Mon, 27 Sep 2021 12:48: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="WHtttgmc"; dkim-atps=neutral Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 221A46012C for ; Mon, 27 Sep 2021 12:48:33 +0200 (CEST) Received: by mail-pl1-x62d.google.com with SMTP id j15so10059946plh.7 for ; Mon, 27 Sep 2021 03:48: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=9YQvZI94UmReHrH9Fuefm9vag2IyDcleBNQfU6/yotA=; b=WHtttgmcOVy0rfmMi7zrVMZt9iOkzUC1uvHnVCvO72sXJ8RrjlsrBlv6SpovUy6NKi 5s3LRIuQU1woDTUlvl3ntv9qBL71bDwhFt5GK0JJXw6g6FGUOR9uWDXbQEacYT0xw0nW ruFWSq0UQJdxZZtu9HKETZbaXfCnOJWoGDPdA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9YQvZI94UmReHrH9Fuefm9vag2IyDcleBNQfU6/yotA=; b=7Qt2IQMVlC0wnGEnvkGsjZ4n6JJM12tyc2ctvI2gdwxGf04YFrWrO1Cn7GRvvsPtG4 xt4YSgf7l4MWFOCXnwEo4jmN28niHHixaErvFSzrxbOxmZLVsdZhYwKxVdp97CKk1SDD hXnQk/U+9P+OAzXQ69iRoVAgufAHetFtBuLtkv33iO01NsqbAGmeOtHfopRNlCFM06Jv RP4AWn0fmBMcEVKPtZ2CPOGehfJIe45z5S9ZrdOJZRINcITtOXwcX6ehoN1D1wrk+mJ+ i8VVfenOeaosKUlVFERuRJU0D7wg6A/c/PMxpkzZMreoeUVsTAddwRbBLuom44Ftnd9O QX3g== X-Gm-Message-State: AOAM533LKuTmE2utDq8jECGsJlpqEbJJzxDADDJ6BWPfhiCUUn2oM5ve zNvBFuo3fLX67wr5QnyHIsi84vfllFEXuw== X-Google-Smtp-Source: ABdhPJxyiVe9vcRrV3Ae/Sm3ql22Jagk/8fSW2hhtWmM71UQbP2fpt9RT6QvCIri9V6dHo6hK2rgVg== X-Received: by 2002:a17:90b:4f8a:: with SMTP id qe10mr19113196pjb.5.1632739711326; Mon, 27 Sep 2021 03:48:31 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:7cac:9967:6683:8845]) by smtp.gmail.com with ESMTPSA id b11sm18694452pge.57.2021.09.27.03.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 03:48:30 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 27 Sep 2021 19:48:21 +0900 Message-Id: <20210927104821.2526508-3-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210927104821.2526508-1-hiroh@chromium.org> References: <20210927104821.2526508-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 2/2] android: Send alternative stream configuration if no buffer to be sent exists 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" A request given in processCaptureRequest() can contain only streams that are resolved CameraStream::Type::Mapped. In the case, no buffer is sent to a native camera. This fixes the issue by looking for the stream to be requested and alternatively sending a buffer for the stream to a camera. However, the substitute stream is Direct and a buffer needs to be provided by a HAL client. So we have to allocate a buffer in Android HAL adaptation layer using PlatformFrameBufferAllocator. Signed-off-by: Hirokazu Honda --- src/android/camera_device.cpp | 50 +++++++++++++++++++++++++++++------ src/android/camera_device.h | 4 +++ src/android/camera_stream.cpp | 37 ++++++++++++++++++++++---- src/android/camera_stream.h | 10 +++++-- 4 files changed, 86 insertions(+), 15 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index a693dcbe..5887e85e 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -724,10 +724,14 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) for (const auto &streamConfig : streamConfigs) { config->addConfiguration(streamConfig.config); + CameraStream *mappedStream = nullptr; for (auto &stream : streamConfig.streams) { streams_.emplace_back(this, config.get(), stream.type, - stream.stream, config->size() - 1); + stream.stream, mappedStream, + config->size() - 1); stream.stream->priv = static_cast(&streams_.back()); + if (stream.type == CameraStream::Type::Direct) + mappedStream = &streams_.back(); } } @@ -969,6 +973,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques LOG(HAL, Debug) << "Queueing request " << descriptor.request_->cookie() << " with " << descriptor.buffers_.size() << " streams"; + + std::set addedStreams; for (unsigned int i = 0; i < descriptor.buffers_.size(); ++i) { const camera3_stream_buffer_t &camera3Buffer = descriptor.buffers_[i]; camera3_stream *camera3Stream = camera3Buffer.stream; @@ -1018,6 +1024,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques * once it has been processed. */ buffer = cameraStream->getBuffer(); + descriptor.internalBuffers_[cameraStream] = buffer; LOG(HAL, Debug) << ss.str() << " (internal)"; break; } @@ -1029,6 +1036,37 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques descriptor.request_->addBuffer(cameraStream->stream(), buffer, camera3Buffer.acquire_fence); + addedStreams.insert(cameraStream->stream()); + } + + for (unsigned int i = 0; i < descriptor.buffers_.size(); ++i) { + const camera3_stream_buffer_t &camera3Buffer = descriptor.buffers_[i]; + camera3_stream *camera3Stream = camera3Buffer.stream; + CameraStream *cameraStream = static_cast(camera3Stream->priv); + if (cameraStream->type() != CameraStream::Type::Mapped) + continue; + if (addedStreams.find(cameraStream->stream()) != addedStreams.end()) + continue; + + CameraStream *mappedStream = cameraStream->mappedStream(); + if (!mappedStream) { + LOG(HAL, Error) + << "Could not find mappedStream for (" + << camera3Stream->width << "x" + << camera3Stream->height << ")" + << "[" << utils::hex(camera3Stream->format) << "]"; + return -EINVAL; + } + + ASSERT(mappedStream->type() == CameraStream::Type::Direct); + FrameBuffer *mappedBuffer = mappedStream->getBuffer(); + if (!mappedBuffer) { + LOG(HAL, Error) << "Failed getting a buffer"; + return -EINVAL; + } + + descriptor.internalBuffers_[mappedStream] = mappedBuffer; + descriptor.request_->addBuffer(mappedStream->stream(), mappedBuffer, -1); } /* @@ -1180,13 +1218,6 @@ void CameraDevice::requestComplete(Request *request) int ret = cameraStream->process(*src, *buffer.buffer, descriptor.settings_, resultMetadata.get()); - /* - * Return the FrameBuffer to the CameraStream now that we're - * done processing it. - */ - if (cameraStream->type() == CameraStream::Type::Internal) - cameraStream->putBuffer(src); - if (ret) { buffer.status = CAMERA3_BUFFER_STATUS_ERROR; notifyError(descriptor.frameNumber_, buffer.stream, @@ -1194,6 +1225,9 @@ void CameraDevice::requestComplete(Request *request) } } + for (auto &[stream, buffer] : descriptor.internalBuffers_) + stream->putBuffer(buffer); + captureResult.result = resultMetadata->get(); callbacks_->process_capture_result(callbacks_, &captureResult); } diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 296c2f18..74d8150b 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -84,6 +85,7 @@ private: std::vector> frameBuffers_; CameraMetadata settings_; std::unique_ptr request_; + std::map internalBuffers_; }; enum class State { @@ -118,6 +120,8 @@ private: std::unique_ptr config_; CameraCapabilities capabilities_; + std::unique_ptr frame_buffer_allocator_; + std::map> requestTemplates_; const camera3_callback_ops_t *callbacks_; diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index e30c7ee4..fc2e82cd 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -18,6 +18,7 @@ #include "camera_capabilities.h" #include "camera_device.h" #include "camera_metadata.h" +#include "frame_buffer.h" using namespace libcamera; @@ -46,10 +47,14 @@ LOG_DECLARE_CATEGORY(HAL) CameraStream::CameraStream(CameraDevice *const cameraDevice, CameraConfiguration *config, Type type, - camera3_stream_t *camera3Stream, unsigned int index) + camera3_stream_t *camera3Stream, + CameraStream *const mappedStream, + unsigned int index) : cameraDevice_(cameraDevice), config_(config), type_(type), - camera3Stream_(camera3Stream), index_(index) + camera3Stream_(camera3Stream), mappedStream_(mappedStream), + index_(index) { + ASSERT(type_ != Type::Mapped || !!mappedStream); } const StreamConfiguration &CameraStream::configuration() const @@ -134,8 +139,30 @@ int CameraStream::process(const FrameBuffer &source, FrameBuffer *CameraStream::getBuffer() { - if (!allocator_) - return nullptr; + if (!mutex_) { + ASSERT(type_ == Type::Direct); + ASSERT(!allocator_); + mutex_ = std::make_unique(); + platform_allocator_ = std::make_unique(cameraDevice_); + const StreamConfiguration &config = configuration(); + size_t numBuffers = config.bufferCount; + const int halPixelFormat = camera3Stream_->format; + const uint32_t usage = camera3Stream_->usage; + LOG(HAL, Error) << "getBuffer@@@@@ " << numBuffers; + // numBuffers is 4 (=config.bufferCount) is not enough sadly... + // Should we dynamically allocate? + numBuffers = 20; + const auto &buffers = platform_allocator_->allocate( + halPixelFormat, config.size, usage, numBuffers); + if (buffers.empty() || buffers.size() != numBuffers) { + LOG(HAL, Error) << "Failed allocating FrameBuffers"; + return nullptr; + } + + buffers_.reserve(numBuffers); + for (const auto &frameBuffer : buffers) + buffers_.push_back(frameBuffer.get()); + } std::lock_guard locker(*mutex_); @@ -143,7 +170,7 @@ FrameBuffer *CameraStream::getBuffer() LOG(HAL, Error) << "Buffer underrun"; return nullptr; } - + LOG(HAL, Error) << buffers_.size(); FrameBuffer *buffer = buffers_.back(); buffers_.pop_back(); diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index 2dab6c3a..c8eee908 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -15,10 +15,11 @@ #include #include -#include #include #include +#include "frame_buffer.h" + class CameraDevice; class CameraMetadata; class PostProcessor; @@ -110,12 +111,14 @@ public: }; CameraStream(CameraDevice *const cameraDevice, libcamera::CameraConfiguration *config, Type type, - camera3_stream_t *camera3Stream, unsigned int index); + camera3_stream_t *camera3Stream, + CameraStream *const mappedStream, unsigned int index); Type type() const { return type_; } const camera3_stream_t &camera3Stream() const { return *camera3Stream_; } const libcamera::StreamConfiguration &configuration() const; libcamera::Stream *stream() const; + CameraStream *mappedStream() const { return mappedStream_; } int configure(); int process(const libcamera::FrameBuffer &source, @@ -130,10 +133,13 @@ private: const libcamera::CameraConfiguration *config_; const Type type_; camera3_stream_t *camera3Stream_; + CameraStream *const mappedStream_; const unsigned int index_; std::unique_ptr allocator_; + std::unique_ptr platform_allocator_; std::vector buffers_; + std::vector> frameBuffers_; /* * The class has to be MoveConstructible as instances are stored in * an std::vector in CameraDevice.