Patch Detail
Show a patch.
GET /api/1.1/patches/22164/?format=api
{ "id": 22164, "url": "https://patchwork.libcamera.org/api/1.1/patches/22164/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22164/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20241204164137.3938891-3-chenghaoyang@chromium.org>", "date": "2024-12-04T16:36:27", "name": "[v3,2/7] android: Set StreamBuffer::srcBuffer in CameraDevice::processCaptureRequest", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "2488f8d4d658d31d431e7f1aaba88d3aa462ad90", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22164/mbox/", "series": [ { "id": 4847, "url": "https://patchwork.libcamera.org/api/1.1/series/4847/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4847", "date": "2024-12-04T16:36:25", "name": "Refactor Android HAL before supporting partial result", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4847/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22164/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22164/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 C5173BDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 4 Dec 2024 16:41:53 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 65461660E4;\n\tWed, 4 Dec 2024 17:41:52 +0100 (CET)", "from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com\n\t[IPv6:2607:f8b0:4864:20::42b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E0246660C5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 4 Dec 2024 17:41:47 +0100 (CET)", "by mail-pf1-x42b.google.com with SMTP id\n\td2e1a72fcca58-724f0f6300aso15974b3a.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 04 Dec 2024 08:41:47 -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\td2e1a72fcca58-725417725e9sm12551779b3a.80.2024.12.04.08.41.43\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 04 Dec 2024 08:41:44 -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=\"EvWqnMN+\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1733330505; x=1733935305;\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=EvWqnMN+SnMlQ87ZHiYzcISvtpseaHXF7X6nZDoj//PCHzg1l+wnBxs6Y9f8uUb0oR\n\tlfH3oXrmxmLsYVdHo9YFGvUJnYw6ZVPMS7nX0/Ri8krv7XcwjK01/S6NyJTUKLP0hcP4\n\t6DxJtxpT5p4d0YRSFOyfFXbbRxo8QIyZq4gD4=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1733330505; x=1733935305;\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=kIoMdBExMYt83esVqFfK4lyZ3B2YrzNFxdfk1WPifxR9Rz9mSvBij/f8UveOhROclQ\n\twoagx547yeck9iYVZQlWJqAbOuRX8HMHwQ/HTduGVtDXNGJ0T58vOk2hOfQXaVR7MKJe\n\tALIzMwThRPEAqab4HATvspnQ2/llkw7fbNjnBd1hhEonRf0Qb+duN3/L6FzBzYRzk3yy\n\ttRcFRZw7iB8nDHTFChF5aXovM8/x6oc54BUHfM/KQ3iCAQ9M/rSnv8WI8jzA5Y1nMYXD\n\tmm90CDXk68A23Ba7lPJW+eJcKrZ8EQqM+rqPwH2h2Mx/gQMJg+Ol2PbEYDXMZOvdDjL7\n\tpy5A==", "X-Gm-Message-State": "AOJu0YyXJAsoyyf5fIiTHX6RLTDv+hkXfjficJ862voDZ+WrGdScODJH\n\taKOc2BF/jYMd89zLNlzFZ3P2aqaLqZmOn5/2ql1by0chPEtuqFH/G8usxplIGBB+DIjVbKBhAZM\n\t=", "X-Gm-Gg": "ASbGnctsqz/mPqtlJVeZCX60Dq/hC4xhCDTnmv+MpuqMUJdWbVwoASmqzeXZ81CMM38\n\t+urPwjN9fFMaCk+K8PM2yVavZ7HuKcuIcVEAgJw1zEyh8wFchZdBuAmv7kTsa7Gu8150e06kwpJ\n\tD3JjwwWaCUKZ4rEF1VfeveMUUZgKIPpGrYGDSgQjwsjxqYhvnygQrVVDcCW3XpzlD+ImmHEOtEl\n\ta5UBcWxfcNmmo7M6XmE/63zG0NbwXZvWeYNzNEUDatGG7EMt2p5T6kTKPlMS+2UyieXQDMMhJ2b\n\tnzDUtmxef6l+rYE9arD3xMk2juZyp+75gNdJiKZxRCSLSqQUeefu7GIe", "X-Google-Smtp-Source": "AGHT+IEOsYVPm81SCTxU5wBUXi3YRlYDKu3rvWq6Rzjvp9uKo7xHZjHfcJrSAshsJyzYMAFQHOmQMQ==", "X-Received": "by 2002:a05:6a00:3a16:b0:724:eac3:576a with SMTP id\n\td2e1a72fcca58-7257fcca19fmr9391185b3a.25.1733330504992; \n\tWed, 04 Dec 2024 08:41:44 -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 v3 2/7] android: Set StreamBuffer::srcBuffer in\n\tCameraDevice::processCaptureRequest", "Date": "Wed, 4 Dec 2024 16:36:27 +0000", "Message-ID": "<20241204164137.3938891-3-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", "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": [ "v3", "2/7" ] }