From patchwork Wed Dec 4 16:36:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-Hao Yang X-Patchwork-Id: 22165 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 4A76CBDB1C for ; Wed, 4 Dec 2024 16:41:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B7664660EB; Wed, 4 Dec 2024 17:41:55 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="NO/CFyNm"; dkim-atps=neutral Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9AD12660DB for ; Wed, 4 Dec 2024 17:41:49 +0100 (CET) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7251abe0e69so38862b3a.0 for ; Wed, 04 Dec 2024 08:41:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733330506; x=1733935306; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=grGNlOBle1EviC0OZSGgVRLbocaEWZG8kJhPP01rB0g=; b=NO/CFyNmAGOkfksYLx3K8Z3cPN4qeb6Z722losMfJnSYgEU4NZgPh1DUBtRTg2LUVL /3OlPnO+sQPsTpJI1u14dt0YpMQVb8X2187QQCHaCRORfWYR/4/oOwXwCiQI9PFRFB7s rqDcczHlSdbzHyQlmq0k/NneAIgm/uv6hnDl4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733330506; x=1733935306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=grGNlOBle1EviC0OZSGgVRLbocaEWZG8kJhPP01rB0g=; b=VQca6SumaL+egH5x+TDRRP52v1NAHJWPH4GpCpcNDDFjGaElG+uugI0j8R2+HfABxC bfs3sP9qGidAXZu7V6VOR3MDFiK5/MsBrZqa9RxNH1DxqOKeIZuoD9Ox+0hX7Z13/4Kl VFIZNgaTBXKfUZgWcroPan+R32aEgdHoUDAvqTlXjVO5b3LNbkdHlNu9Wq+ABLyxXkME PuNlGJrQeSpqlgB1+22pxfpFvGGjkf9b5mpEMqEzO6sT7Q7556eDP00wKYxCstnqy3FZ 3QULjJfFC9cfD3bAMjdlMVs3V/1dlr1A5IWtq2vI8+nTixjzvJAabgd6QlnSNtRAWNlI 06PQ== X-Gm-Message-State: AOJu0YzDFHQdSL97FXIrVc+Q/J8QAFoTXoTtR40j2iKbQNxr7ja6+/hp m0WrsmctLDch3CF4OhrO7VIGYl/6qNJrjTBzUtvKkTzhFufSvOr6B0deUp5SfSzkxIDayUt7pvM = X-Gm-Gg: ASbGncvKPeX+lT9bMWMDev3TP/nu52gp3qDVn8JKls2wXjHN1uALT8cl0ISEl+dm4An WVdX2xSnE/it33a2wT1fHZUso2PgbPawEwncAHE3V9jj0fT4FqX6Inwg5fdteADNzBsB5EOxr2H iPkDS9t3kkd+aFkVOzK9oB/s8+gD74ziDCgTBOikoZv6mmqKJgGUsfaj82uVT5dIvvzEcz4b4Op l1HzWsRSq/D9Noi40HLdGhZdBkXpgkaQRZCo/rihtG2brdYnxMCafGwc2q4U3kg/Xhb5kcq5/Rm VU1lwqyhbIog0OLVqk2WneHGiK+TGw+fRY8+I+//3QWK9Rvg8eaLKTdW X-Google-Smtp-Source: AGHT+IEm6dpeuC2o/gdURtr1wPQ/Dk/B5Ccav2NswUj7G2jJwJRHLVwtCcfuz91HhJYPPL5x3vukNw== X-Received: by 2002:a05:6a00:1703:b0:724:62b3:58da with SMTP id d2e1a72fcca58-7257fa59b65mr8875202b3a.6.1733330506528; Wed, 04 Dec 2024 08:41:46 -0800 (PST) Received: from chenghaoyang-low.c.googlers.com.com (112.212.229.35.bc.googleusercontent.com. [35.229.212.112]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725417725e9sm12551779b3a.80.2024.12.04.08.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Dec 2024 08:41:46 -0800 (PST) From: Harvey Yang To: libcamera-devel@lists.libcamera.org Cc: Harvey Yang , Han-Lin Chen Subject: [PATCH v3 3/7] android: Correctly support multiple Mapped streams Date: Wed, 4 Dec 2024 16:36:28 +0000 Message-ID: <20241204164137.3938891-4-chenghaoyang@chromium.org> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog In-Reply-To: <20241204164137.3938891-1-chenghaoyang@chromium.org> References: <20241204164137.3938891-1-chenghaoyang@chromium.org> MIME-Version: 1.0 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" The Android camera HAL supports creating streams for the Android framework by post-processing streams produced by libcamera. However at the moment a single Mapped stream can be associated with a Direct stream because, after the first post-processing, the data from the internal stream are returned preventing further post-processing passes. Fix this by storing the list of Direct stream buffers used as the post-processing source in an Camera3RequestDescriptor::internalBuffers_ map to replace the single internalBuffer_ pointer and return the internal buffers when the capture request is deleted. Signed-off-by: Han-Lin Chen Co-developed-by: Harvey Yang Signed-off-by: Harvey Yang Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 66 +++++++++++++++++++--------------- src/android/camera_request.cpp | 11 +++--- src/android/camera_request.h | 3 +- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index f6dadaf22..f2dd8d4fd 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -966,9 +966,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques * to a libcamera stream. Streams of type Mapped will be handled later. * * Collect the CameraStream associated to each requested capture stream. - * Since requestedStreams is an std:map<>, no duplications can happen. + * Since directBuffers is an std:map<>, no duplications can + * happen. */ - std::map requestedBuffers; + std::map directBuffers; for (const auto &[i, buffer] : utils::enumerate(descriptor->buffers_)) { CameraStream *cameraStream = buffer.stream; camera3_stream_t *camera3Stream = cameraStream->camera3Stream(); @@ -1007,6 +1008,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques cameraStream->configuration().size); frameBuffer = buffer.frameBuffer.get(); acquireFence = std::move(buffer.fence); + + directBuffers[cameraStream] = frameBuffer; LOG(HAL, Debug) << ss.str() << " (direct)"; break; @@ -1015,13 +1018,17 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques * Get the frame buffer from the CameraStream internal * buffer pool. * - * The buffer has to be returned to the CameraStream - * once it has been processed. + * The buffer will be returned to the CameraStream when + * the request is destroyed. */ frameBuffer = cameraStream->getBuffer(); - buffer.internalBuffer = frameBuffer; buffer.srcBuffer = frameBuffer; + /* + * Track the allocated internal buffers, which will be + * recycled when the descriptor destroyed. + */ + descriptor->internalBuffers_[cameraStream] = frameBuffer; LOG(HAL, Debug) << ss.str() << " (internal)"; descriptor->pendingStreamsToProcess_.insert( @@ -1037,8 +1044,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques auto fence = std::make_unique(std::move(acquireFence)); descriptor->request_->addBuffer(cameraStream->stream(), frameBuffer, std::move(fence)); - - requestedBuffers[cameraStream] = frameBuffer; } /* @@ -1076,24 +1081,43 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques * post-processing. No need to recycle the buffer since it's * owned by Android. */ - auto iterDirectBuffer = requestedBuffers.find(sourceStream); - if (iterDirectBuffer != requestedBuffers.end()) { + auto iterDirectBuffer = directBuffers.find(sourceStream); + if (iterDirectBuffer != directBuffers.end()) { buffer.srcBuffer = iterDirectBuffer->second; continue; } /* - * If that's not the case, we need to add a buffer to the request - * for this stream. + * If that's not the case, we use an internal buffer allocated + * from the source stream. + */ + + /* + * If an internal buffer has been requested for the source + * stream before, we should reuse it. */ - FrameBuffer *frameBuffer = cameraStream->getBuffer(); - buffer.internalBuffer = frameBuffer; + auto iterInternalBuffer = descriptor->internalBuffers_.find(sourceStream); + if (iterInternalBuffer != descriptor->internalBuffers_.end()) { + buffer.srcBuffer = iterInternalBuffer->second; + continue; + } + + /* + * Otherwise, we need to create an internal buffer to the + * request for the source stream. Get the frame buffer from the + * source stream's internal buffer pool. + * + * The buffer will be returned to the CameraStream when the + * request is destructed. + */ + FrameBuffer *frameBuffer = sourceStream->getBuffer(); buffer.srcBuffer = frameBuffer; descriptor->request_->addBuffer(sourceStream->stream(), frameBuffer, nullptr); - requestedBuffers[sourceStream] = frameBuffer; + /* Track the allocated internal buffer. */ + descriptor->internalBuffers_[sourceStream] = frameBuffer; } /* @@ -1253,13 +1277,6 @@ void CameraDevice::requestComplete(Request *request) if (ret) { setBufferStatus(*buffer, StreamBuffer::Status::Error); descriptor->pendingStreamsToProcess_.erase(stream); - - /* - * If the framebuffer is internal to CameraStream return - * it back now that we're done processing it. - */ - if (buffer->internalBuffer) - stream->putBuffer(buffer->internalBuffer); } } @@ -1378,13 +1395,6 @@ void CameraDevice::streamProcessingComplete(StreamBuffer *streamBuffer, { setBufferStatus(*streamBuffer, status); - /* - * If the framebuffer is internal to CameraStream return it back now - * that we're done processing it. - */ - if (streamBuffer->internalBuffer) - streamBuffer->stream->putBuffer(streamBuffer->internalBuffer); - Camera3RequestDescriptor *request = streamBuffer->request; { diff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp index 52a3ac1f7..92e74ab6a 100644 --- a/src/android/camera_request.cpp +++ b/src/android/camera_request.cpp @@ -10,6 +10,7 @@ #include #include "camera_buffer.h" +#include "camera_stream.h" using namespace libcamera; @@ -138,7 +139,12 @@ Camera3RequestDescriptor::Camera3RequestDescriptor( request_ = camera->createRequest(reinterpret_cast(this)); } -Camera3RequestDescriptor::~Camera3RequestDescriptor() = default; +Camera3RequestDescriptor::~Camera3RequestDescriptor() +{ + /* Recycle the allocated internal buffer back to its source stream. */ + for (auto &[sourceStream, frameBuffer] : internalBuffers_) + sourceStream->putBuffer(frameBuffer); +} /** * \class StreamBuffer @@ -166,9 +172,6 @@ Camera3RequestDescriptor::~Camera3RequestDescriptor() = default; * \var StreamBuffer::status * \brief Track the status of the buffer * - * \var StreamBuffer::internalBuffer - * \brief Pointer to a buffer internally handled by CameraStream (if any) - * * \var StreamBuffer::srcBuffer * \brief Pointer to the source frame buffer used for post-processing * diff --git a/src/android/camera_request.h b/src/android/camera_request.h index 335f1985d..6b2a00795 100644 --- a/src/android/camera_request.h +++ b/src/android/camera_request.h @@ -49,7 +49,6 @@ public: std::unique_ptr frameBuffer; libcamera::UniqueFD fence; Status status = Status::Success; - libcamera::FrameBuffer *internalBuffer = nullptr; const libcamera::FrameBuffer *srcBuffer = nullptr; std::unique_ptr dstBuffer; Camera3RequestDescriptor *request; @@ -85,6 +84,8 @@ public: std::unique_ptr request_; std::unique_ptr resultMetadata_; + std::map internalBuffers_; + bool complete_ = false; Status status_ = Status::Success;