Patch Detail
Show a patch.
GET /api/patches/22270/?format=api
{ "id": 22270, "url": "https://patchwork.libcamera.org/api/patches/22270/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22270/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "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-3-chenghaoyang@chromium.org>", "date": "2024-12-10T14:23:55", "name": "[v4,2/7] android: Set StreamBuffer::srcBuffer in CameraDevice::processCaptureRequest", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "2488f8d4d658d31d431e7f1aaba88d3aa462ad90", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22270/mbox/", "series": [ { "id": 4870, "url": "https://patchwork.libcamera.org/api/series/4870/?format=api", "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/22270/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22270/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 9A93EC3257\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 10 Dec 2024 14:26:10 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9AF6F67E90;\n\tTue, 10 Dec 2024 15:26:09 +0100 (CET)", "from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com\n\t[IPv6:2607:f8b0:4864:20::102f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B1E9967E85\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Dec 2024 15:26:06 +0100 (CET)", "by mail-pj1-x102f.google.com with SMTP id\n\t98e67ed59e1d1-2ee76929a98so4409264a91.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Dec 2024 06:26:06 -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.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 10 Dec 2024 06:26:04 -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=\"h5eX9RwO\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1733840765; x=1734445565;\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=7RSUBsgMlBRQcCiQn/OQffu9bSxAh/8WGY8/nToqTB8=;\n\tb=h5eX9RwOsDCzRlFcxaZwTRyvkbvklv7RTOSZ+tJc9BBhB6ZI9YJfymmNw9O2JB4y30\n\tNL/g2RSCA+YNdwOZzoK7iLWORQuZr08OuWDtCQXmdPtmEt+O3+w5Z5PIzSqFiRtVoWah\n\teRjj+0cEeVvZqQLGmtzhbK0C57ZyKmqZpijuA=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1733840765; x=1734445565;\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=7RSUBsgMlBRQcCiQn/OQffu9bSxAh/8WGY8/nToqTB8=;\n\tb=QmEr6y4GdBXRG0OubaXi96l0B+4oa5O1eKXxnHya9yZ+DDocV1Umym6bzwqXvb+Pg2\n\t4FEx1TXUB2AaTrnq+0ql+/+wEjxLK6Ji2ZDUEVhlUZZNRtysCvDZQQ0vNk0XK5zhaC9f\n\tu+a34C7MBhSgrDAtnfvosrH57i7rgD00JHNVWboxebjWsI9IaEG9E0udqwUitXoHXAeo\n\t5LIfAMxetHU1bFnjZrsWDQaKpROQ/s29OZ0HyHNa8K6m8CWR4KudSdGbVkD2kfSdbYhC\n\t82CppxYn5zy/fdgiKf8pJxpYkrvWmsAYwSPyqxUm5BTmDmInQc1WYHgK4QfwptYdOET7\n\txXug==", "X-Gm-Message-State": "AOJu0YwWjjADhhWYxIQ2BDcBe3W61cuWIhuJNlscmBb5Ql4eSqnn579V\n\tZIA98CLdS2LcmaitAVqSOedlN8cVS/I9mbjjKjeL16UU0zAJufwIFxh24su5bM0G6u8kfxwZoRc\n\t=", "X-Gm-Gg": "ASbGncs/bQsvTBY50Zdx3HIMe1Pun74ozTj1CoumDV/xYfwVd/KTXBoWMzS2OmcNQex\n\t13rf6jAaPsTR1OyPxunaYODyA7CfYNDpxb2B5ci03vSRZXdBoCBItuHhIExH8s7HxTDPrd+BhtX\n\tqzK6Y51DkeGhI/D1vsagPT5gtZGqfl1xgt129QosIRa+ihsuvcTubJgLDQKK4xHIKaanKpvsEP3\n\twNWkANh+wplqqdGmn/jm6OPfwaQaRzOsxldCnhpG049oU1RR3Y6ltP4yZC57raAUGwIXNyDkZTL\n\teopgfE0GaJMdIIRvNg+GW4qjf7RSGVODJgcjdyxybtAkxZ7s6eSagEdxWKYS", "X-Google-Smtp-Source": "AGHT+IGaw2zjiZPuu8FAyKww2a8rQvWXahex/o8HhofuiRnIMe4kuxYH2faKSsmsZYOEX55D3wrO3A==", "X-Received": "by 2002:a17:90b:17c8:b0:2ee:ee77:226d with SMTP id\n\t98e67ed59e1d1-2efd597dfb8mr5339886a91.4.1733840764875; \n\tTue, 10 Dec 2024 06:26:04 -0800 (PST)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Harvey Yang <chenghaoyang@chromium.org>,\n\tHan-Lin Chen <hanlinchen@chromium.org>", "Subject": "[PATCH v4 2/7] android: Set StreamBuffer::srcBuffer in\n\tCameraDevice::processCaptureRequest", "Date": "Tue, 10 Dec 2024 14:23:55 +0000", "Message-ID": "<20241210142557.2886315-3-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "StreamBuffer::srcBuffer was set right before being processed, while it\nwas already determined when being constructed. This patch sets the value\nin CameraDevice::processCaptureRequest. `requestedStreams` is refactored\nfrom std::set to std::map to find the correct srcBuffer accordingly.\n\nThe change also helps cleaning up the post process pipeline's dependency\non `Camera3RequestDescriptor::pendingStreamsToProcess_`, which is going\nto be cleaned up in the following patches.\n\nSigned-off-by: Han-Lin Chen <hanlinchen@chromium.org>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/android/camera_device.cpp | 28 +++++++++++++++++++---------\n 1 file changed, 19 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 4e3bdc9cc..f6dadaf22 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -9,7 +9,6 @@\n \n #include <algorithm>\n #include <fstream>\n-#include <set>\n #include <sys/mman.h>\n #include <unistd.h>\n #include <vector>\n@@ -967,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:set<>, no duplications can happen.\n+\t * Since requestedStreams is an std:map<>, no duplications can happen.\n \t */\n-\tstd::set<CameraStream *> requestedStreams;\n+\tstd::map<CameraStream *, libcamera::FrameBuffer *> requestedBuffers;\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@@ -1021,6 +1020,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\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\tLOG(HAL, Debug) << ss.str() << \" (internal)\";\n \n \t\t\tdescriptor->pendingStreamsToProcess_.insert(\n@@ -1037,7 +1038,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tdescriptor->request_->addBuffer(cameraStream->stream(),\n \t\t\t\t\t\tframeBuffer, std::move(fence));\n \n-\t\trequestedStreams.insert(cameraStream);\n+\t\trequestedBuffers[cameraStream] = frameBuffer;\n \t}\n \n \t/*\n@@ -1067,9 +1068,19 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t * added to the request.\n \t\t */\n \t\tCameraStream *sourceStream = cameraStream->sourceStream();\n-\t\tASSERT(sourceStream);\n-\t\tif (requestedStreams.find(sourceStream) != requestedStreams.end())\n+\t\tASSERT(sourceStream && sourceStream->type() == CameraStream::Type::Direct);\n+\n+\t\t/*\n+\t\t * If the buffer for the source stream has been requested as\n+\t\t * Direct, use its framebuffer as the source buffer for\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\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@@ -1077,11 +1088,12 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t */\n \t\tFrameBuffer *frameBuffer = cameraStream->getBuffer();\n \t\tbuffer.internalBuffer = frameBuffer;\n+\t\tbuffer.srcBuffer = frameBuffer;\n \n \t\tdescriptor->request_->addBuffer(sourceStream->stream(),\n \t\t\t\t\t\tframeBuffer, nullptr);\n \n-\t\trequestedStreams.insert(sourceStream);\n+\t\trequestedBuffers[sourceStream] = frameBuffer;\n \t}\n \n \t/*\n@@ -1236,8 +1248,6 @@ void CameraDevice::requestComplete(Request *request)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tbuffer->srcBuffer = src;\n-\n \t\t++iter;\n \t\tint ret = stream->process(buffer);\n \t\tif (ret) {\n", "prefixes": [ "v4", "2/7" ] }