{"id":22271,"url":"https://patchwork.libcamera.org/api/patches/22271/?format=json","web_url":"https://patchwork.libcamera.org/patch/22271/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241210142557.2886315-4-chenghaoyang@chromium.org>","date":"2024-12-10T14:23:56","name":"[v4,3/7] android: Correctly support multiple Mapped streams","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b1b8fc655527bbb5f8a81f1b7c30ddb005638ffb","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22271/mbox/","series":[{"id":4870,"url":"https://patchwork.libcamera.org/api/series/4870/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4870","date":"2024-12-10T14:23:53","name":"Refactor Android HAL before supporting partial result","version":4,"mbox":"https://patchwork.libcamera.org/series/4870/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22271/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22271/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id C2996C3257\n\tfor ;\n\tTue, 10 Dec 2024 14:26:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6D37B67E92;\n\tTue, 10 Dec 2024 15:26:11 +0100 (CET)","from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com\n\t[IPv6:2607:f8b0:4864:20::102b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 40ACB67E8D\n\tfor ;\n\tTue, 10 Dec 2024 15:26:08 +0100 (CET)","by mail-pj1-x102b.google.com with SMTP id\n\t98e67ed59e1d1-2efded08c79so458098a91.0\n\tfor ;\n\tTue, 10 Dec 2024 06:26:08 -0800 (PST)","from chenghaoyang-low.c.googlers.com.com\n\t(112.212.229.35.bc.googleusercontent.com. [35.229.212.112])\n\tby smtp.gmail.com with ESMTPSA id\n\t98e67ed59e1d1-2ef26ff97f2sm11812053a91.11.2024.12.10.06.26.05\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 10 Dec 2024 06:26:06 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"fjuObykP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1733840766; x=1734445566;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=MbONCrxxlu5qaHg94AwjcNNxPrpZW9pFEh4Xyevk5rs=;\n\tb=fjuObykPNGo5tl8PKXzoumtT2XA53zsP7WEa8okWSOxbpkS/bmhew/3KR5wMBIvlAl\n\tmAh/610toZnb21r2xNcviqs+ghTJJzBVEob4yqq2mFzhjbriubb8YaNEgUZFBf0CGnzn\n\tDPni0673xV/RZ0+l4AjHc1pvxfcsFPZ+dX698=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1733840766; x=1734445566;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=MbONCrxxlu5qaHg94AwjcNNxPrpZW9pFEh4Xyevk5rs=;\n\tb=RBG87gSyKWw5ScOypBh/aWTYG3xv2g8o8pxjkGQfR7fOp/EFxx9hRFni7vrxr7pCn4\n\tl09Qj8LqjaGoG+/BKm7N3sb6FDTq6pRqR6qFW6NxQqO7iMc7T3glEl876tfVTBDSN3gT\n\tjN5Rnx6ivkmmQ5uQ+vPAFes9Re1Oj/XFUOaikL73pM+mIC3jK01vCQrS1n6sVxWXxo6h\n\t4ukEKg8KUB5ddt39HB4gxN5jxXAYJ+2/6mxHOfpGKrqM/9re/h6zzwS8m4s9Hd9IyxWU\n\tiYtQNxBxWFkhEY42wKsSmrlLqQTtvPKV65KcpQQYsh/Q/lwBNhqy1NV1mtXVT9q7AiiD\n\tremg==","X-Gm-Message-State":"AOJu0YwZYHGbSjQB0P8erpsHXDcGTSyAZ5Fv7sdTLTc2H6Czqndq4mZx\n\tw7eyNhcYtwT1buc2ajaSY36dvo9MOigcR6BXx5/2oV1tqpTWDePz1fmdrhurbP1dLlxgH3sNbiM\n\t=","X-Gm-Gg":"ASbGnctt9aP9p8jRTHYBNS5RWg+sVO8K6v3sLXtPISwHRpjSivgq55l59hiHixd0PDa\n\tc56cN5gFvQu1kECbLQToqT3JWRJXX7grzFr7nH0jRJdQ0qplacw0uaMZ9BvRidJIQ4+/EO5dISV\n\tLCCMGM7O5x9A4R+0XwwEL1ZwqBMCt5rmJ6X8Px0N0O+cZpV6kEK1/wY+2dLVIkpKS91wZ28F+ka\n\t2yroRsFo84Ghy5RKBktGh8+AgHizbcaHcWbHC02WVszXvh6TCf8VEJvgpRr6UexZ/8hzFmjsbU1\n\tulJPQQ98du0UVPprHZS+nuYOSn8kZxCymB6sVOVKWdnFzrbsU1WWvsHrqFZb","X-Google-Smtp-Source":"AGHT+IEUl5BISdsGpljYIFVeCZOVUu1qDBp8MgWvWI2WyWvnTSuR+FJcpBy2njOQkE2RA71z5lXuiw==","X-Received":"by 2002:a17:90b:5102:b0:2ef:e0bb:1ef2 with SMTP id\n\t98e67ed59e1d1-2efe0bb1ff5mr2676540a91.19.1733840766405; \n\tTue, 10 Dec 2024 06:26:06 -0800 (PST)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Harvey Yang ,\n\tHan-Lin Chen ,\n\tJacopo Mondi ","Subject":"[PATCH v4 3/7] android: Correctly support multiple Mapped streams","Date":"Tue, 10 Dec 2024 14:23:56 +0000","Message-ID":"<20241210142557.2886315-4-chenghaoyang@chromium.org>","X-Mailer":"git-send-email 2.47.0.338.g60cca15819-goog","In-Reply-To":"<20241210142557.2886315-1-chenghaoyang@chromium.org>","References":"<20241210142557.2886315-1-chenghaoyang@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Android camera HAL supports creating streams for the Android\nframework by post-processing streams produced by libcamera.\n\nHowever at the moment a single Mapped stream can be associated with a\nDirect stream because, after the first post-processing, the data from\nthe internal stream are returned preventing further post-processing\npasses.\n\nFix this by storing the list of Internal stream buffers used as the\npost-processing source in an Camera3RequestDescriptor::internalBuffers_\nmap to replace the single internalBuffer_ pointer and return the\ninternal buffers when the capture request is deleted.\n\nSigned-off-by: Han-Lin Chen \nCo-developed-by: Harvey Yang \nSigned-off-by: Harvey Yang \nReviewed-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 65 +++++++++++++++++++---------------\n src/android/camera_request.cpp | 11 +++---\n src/android/camera_request.h | 3 +-\n 3 files changed, 46 insertions(+), 33 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex f6dadaf22..6bc19a74a 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -966,9 +966,9 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t * to a libcamera stream. Streams of type Mapped will be handled later.\n \t *\n \t * Collect the CameraStream associated to each requested capture stream.\n-\t * Since requestedStreams is an std:map<>, no duplications can happen.\n+\t * Since directBuffers is an std:map<>, no duplications can happen.\n \t */\n-\tstd::map requestedBuffers;\n+\tstd::map directBuffers;\n \tfor (const auto &[i, buffer] : utils::enumerate(descriptor->buffers_)) {\n \t\tCameraStream *cameraStream = buffer.stream;\n \t\tcamera3_stream_t *camera3Stream = cameraStream->camera3Stream();\n@@ -1007,6 +1007,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t\t\t\t cameraStream->configuration().size);\n \t\t\tframeBuffer = buffer.frameBuffer.get();\n \t\t\tacquireFence = std::move(buffer.fence);\n+\n+\t\t\tdirectBuffers[cameraStream] = frameBuffer;\n \t\t\tLOG(HAL, Debug) << ss.str() << \" (direct)\";\n \t\t\tbreak;\n \n@@ -1015,13 +1017,17 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * Get the frame buffer from the CameraStream internal\n \t\t\t * buffer pool.\n \t\t\t *\n-\t\t\t * The buffer has to be returned to the CameraStream\n-\t\t\t * once it has been processed.\n+\t\t\t * The buffer will be returned to the CameraStream when\n+\t\t\t * the request is destroyed.\n \t\t\t */\n \t\t\tframeBuffer = cameraStream->getBuffer();\n-\t\t\tbuffer.internalBuffer = frameBuffer;\n \t\t\tbuffer.srcBuffer = frameBuffer;\n \n+\t\t\t/*\n+\t\t\t * Track the allocated internal buffers, which will be\n+\t\t\t * recycled when the descriptor is destroyed.\n+\t\t\t */\n+\t\t\tdescriptor->internalBuffers_[cameraStream] = frameBuffer;\n \t\t\tLOG(HAL, Debug) << ss.str() << \" (internal)\";\n \n \t\t\tdescriptor->pendingStreamsToProcess_.insert(\n@@ -1037,8 +1043,6 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tauto fence = std::make_unique(std::move(acquireFence));\n \t\tdescriptor->request_->addBuffer(cameraStream->stream(),\n \t\t\t\t\t\tframeBuffer, std::move(fence));\n-\n-\t\trequestedBuffers[cameraStream] = frameBuffer;\n \t}\n \n \t/*\n@@ -1076,24 +1080,43 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t * post-processing. No need to recycle the buffer since it's\n \t\t * owned by Android.\n \t\t */\n-\t\tauto iterDirectBuffer = requestedBuffers.find(sourceStream);\n-\t\tif (iterDirectBuffer != requestedBuffers.end()) {\n+\t\tauto iterDirectBuffer = directBuffers.find(sourceStream);\n+\t\tif (iterDirectBuffer != directBuffers.end()) {\n \t\t\tbuffer.srcBuffer = iterDirectBuffer->second;\n \t\t\tcontinue;\n \t\t}\n \n \t\t/*\n-\t\t * If that's not the case, we need to add a buffer to the request\n-\t\t * for this stream.\n+\t\t * If that's not the case, we use an internal buffer allocated\n+\t\t * from the source stream.\n+\t\t */\n+\n+\t\t/*\n+\t\t * If an internal buffer has been requested for the source\n+\t\t * stream before, we should reuse it.\n \t\t */\n-\t\tFrameBuffer *frameBuffer = cameraStream->getBuffer();\n-\t\tbuffer.internalBuffer = frameBuffer;\n+\t\tauto iterInternalBuffer = descriptor->internalBuffers_.find(sourceStream);\n+\t\tif (iterInternalBuffer != descriptor->internalBuffers_.end()) {\n+\t\t\tbuffer.srcBuffer = iterInternalBuffer->second;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Otherwise, we need to create an internal buffer to the\n+\t\t * request for the source stream. Get the frame buffer from the\n+\t\t * source stream's internal buffer pool.\n+\t\t *\n+\t\t * The buffer will be returned to the CameraStream when the\n+\t\t * request is destructed.\n+\t\t */\n+\t\tFrameBuffer *frameBuffer = sourceStream->getBuffer();\n \t\tbuffer.srcBuffer = frameBuffer;\n \n \t\tdescriptor->request_->addBuffer(sourceStream->stream(),\n \t\t\t\t\t\tframeBuffer, nullptr);\n \n-\t\trequestedBuffers[sourceStream] = frameBuffer;\n+\t\t/* Track the allocated internal buffer. */\n+\t\tdescriptor->internalBuffers_[sourceStream] = frameBuffer;\n \t}\n \n \t/*\n@@ -1253,13 +1276,6 @@ void CameraDevice::requestComplete(Request *request)\n \t\tif (ret) {\n \t\t\tsetBufferStatus(*buffer, StreamBuffer::Status::Error);\n \t\t\tdescriptor->pendingStreamsToProcess_.erase(stream);\n-\n-\t\t\t/*\n-\t\t\t * If the framebuffer is internal to CameraStream return\n-\t\t\t * it back now that we're done processing it.\n-\t\t\t */\n-\t\t\tif (buffer->internalBuffer)\n-\t\t\t\tstream->putBuffer(buffer->internalBuffer);\n \t\t}\n \t}\n \n@@ -1378,13 +1394,6 @@ void CameraDevice::streamProcessingComplete(StreamBuffer *streamBuffer,\n {\n \tsetBufferStatus(*streamBuffer, status);\n \n-\t/*\n-\t * If the framebuffer is internal to CameraStream return it back now\n-\t * that we're done processing it.\n-\t */\n-\tif (streamBuffer->internalBuffer)\n-\t\tstreamBuffer->stream->putBuffer(streamBuffer->internalBuffer);\n-\n \tCamera3RequestDescriptor *request = streamBuffer->request;\n \n \t{\ndiff --git a/src/android/camera_request.cpp b/src/android/camera_request.cpp\nindex 52a3ac1f7..92e74ab6a 100644\n--- a/src/android/camera_request.cpp\n+++ b/src/android/camera_request.cpp\n@@ -10,6 +10,7 @@\n #include \n \n #include \"camera_buffer.h\"\n+#include \"camera_stream.h\"\n \n using namespace libcamera;\n \n@@ -138,7 +139,12 @@ Camera3RequestDescriptor::Camera3RequestDescriptor(\n \trequest_ = camera->createRequest(reinterpret_cast(this));\n }\n \n-Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n+Camera3RequestDescriptor::~Camera3RequestDescriptor()\n+{\n+\t/* Recycle the allocated internal buffer back to its source stream. */\n+\tfor (auto &[sourceStream, frameBuffer] : internalBuffers_)\n+\t\tsourceStream->putBuffer(frameBuffer);\n+}\n \n /**\n * \\class StreamBuffer\n@@ -166,9 +172,6 @@ Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n * \\var StreamBuffer::status\n * \\brief Track the status of the buffer\n *\n- * \\var StreamBuffer::internalBuffer\n- * \\brief Pointer to a buffer internally handled by CameraStream (if any)\n- *\n * \\var StreamBuffer::srcBuffer\n * \\brief Pointer to the source frame buffer used for post-processing\n *\ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex 335f1985d..6b2a00795 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -49,7 +49,6 @@ public:\n \tstd::unique_ptr frameBuffer;\n \tlibcamera::UniqueFD fence;\n \tStatus status = Status::Success;\n-\tlibcamera::FrameBuffer *internalBuffer = nullptr;\n \tconst libcamera::FrameBuffer *srcBuffer = nullptr;\n \tstd::unique_ptr dstBuffer;\n \tCamera3RequestDescriptor *request;\n@@ -85,6 +84,8 @@ public:\n \tstd::unique_ptr request_;\n \tstd::unique_ptr resultMetadata_;\n \n+\tstd::map internalBuffers_;\n+\n \tbool complete_ = false;\n \tStatus status_ = Status::Success;\n \n","prefixes":["v4","3/7"]}