Patch Detail
Show a patch.
GET /api/1.1/patches/22436/?format=api
{ "id": 22436, "url": "https://patchwork.libcamera.org/api/1.1/patches/22436/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22436/", "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": "<20241220150759.709756-11-pobrn@protonmail.com>", "date": "2024-12-20T15:08:46", "name": "[RFC,v1,10/12] apps: lc-compliance: Move request creation into common function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e739a381ce0d6397e6a1dca057f09287e66a786e", "submitter": { "id": 133, "url": "https://patchwork.libcamera.org/api/1.1/people/133/?format=api", "name": "Pőcze Barnabás", "email": "pobrn@protonmail.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22436/mbox/", "series": [ { "id": 4923, "url": "https://patchwork.libcamera.org/api/1.1/series/4923/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4923", "date": "2024-12-20T15:08:03", "name": "apps: lc-compliance: Multi-stream tests", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4923/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22436/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22436/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 0FE02C3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 20 Dec 2024 15:08:54 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 65E22684B6;\n\tFri, 20 Dec 2024 16:08:53 +0100 (CET)", "from mail-10630.protonmail.ch (mail-10630.protonmail.ch\n\t[79.135.106.30])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 900BC684A2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 Dec 2024 16:08:51 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=protonmail.com header.i=@protonmail.com\n\theader.b=\"knAmMQ21\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;\n\ts=protonmail3; t=1734707330; x=1734966530;\n\tbh=/3WlX5EfLCj0pHQugTvk5SHZZO0FyUNvfLhnXbm/j7c=;\n\th=Date:To:From:Subject:Message-ID:In-Reply-To:References:\n\tFeedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:\n\tMessage-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post;\n\tb=knAmMQ21eIQhRYrGjDVGv9Pc+JTN/AgA5qfJikfDNEs0+AkdlUavXy6HY2h8aY5V2\n\t8dZqQDflJHVfa6Af1X+zYkaErCJdHB8+1UdEa3tsB/KRwPQ9La1/iy5S9ZWl9F1qAl\n\tdQKwEZdmpIKlyoVLdfJEQnfyCOXT5TUFmWUmx4Jn3NUlbUBXWQJYcQLsqi15ry2l1e\n\tiF/+YLT2VSqOkIJQCtIsgF2+zAmmi584oQV2OlmtzWOnGnj3fPE+Sy9Kg3XAmL8XOJ\n\tNcGkuJiQeMqqaYh/6NO0718oIUQl94LEPb1LDWd7OzzmcQTBhAkSr0QaNaCe515VBq\n\tsqxqa+k8v6BPw==", "Date": "Fri, 20 Dec 2024 15:08:46 +0000", "To": "libcamera-devel@lists.libcamera.org", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <pobrn@protonmail.com>", "Subject": "[RFC PATCH v1 10/12] apps: lc-compliance: Move request creation into\n\tcommon function", "Message-ID": "<20241220150759.709756-11-pobrn@protonmail.com>", "In-Reply-To": "<20241220150759.709756-1-pobrn@protonmail.com>", "References": "<20241220150759.709756-1-pobrn@protonmail.com>", "Feedback-ID": "20568564:user:proton", "X-Pm-Message-ID": "02a0c80a5695a2c671cfa52c49a68478a557a176", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=utf-8", "Content-Transfer-Encoding": "quoted-printable", "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": "`CaptureBalanced` and `CaptureUnbalanced` share the same logic\nfor creating requests and assigning buffers, only the queueing\nof requests is slightly different. Move this common part into\na separate function in the base class.\n\nSigned-off-by: Barnabás Pőcze <pobrn@protonmail.com>\n---\n src/apps/lc-compliance/helpers/capture.cpp | 66 +++++++++++-----------\n src/apps/lc-compliance/helpers/capture.h | 2 +\n 2 files changed, 35 insertions(+), 33 deletions(-)", "diff": "diff --git a/src/apps/lc-compliance/helpers/capture.cpp b/src/apps/lc-compliance/helpers/capture.cpp\nindex 5cc7635f7..7a05be9a3 100644\n--- a/src/apps/lc-compliance/helpers/capture.cpp\n+++ b/src/apps/lc-compliance/helpers/capture.cpp\n@@ -7,6 +7,8 @@\n \n #include \"capture.h\"\n \n+#include <assert.h>\n+\n #include <gtest/gtest.h>\n \n using namespace libcamera;\n@@ -74,43 +76,51 @@ void Capture::stop()\n \tallocator_.free(stream);\n }\n \n-/* CaptureBalanced */\n-\n-CaptureBalanced::CaptureBalanced(std::shared_ptr<Camera> camera)\n-\t: Capture(std::move(camera))\n+void Capture::prepareRequests(unsigned int plannedRequests)\n {\n-}\n-\n-void CaptureBalanced::capture(unsigned int numRequests)\n-{\n-\tstart();\n+\tassert(config_);\n+\tassert(requests_.empty());\n \n \tStream *stream = config_->at(0).stream();\n \tconst std::vector<std::unique_ptr<FrameBuffer>> &buffers = allocator_.buffers(stream);\n \n \t/* No point in testing less requests then the camera depth. */\n-\tif (buffers.size() > numRequests) {\n-\t\tstd::cout << \"Camera needs \" + std::to_string(buffers.size())\n-\t\t\t+ \" requests, can't test only \"\n-\t\t\t+ std::to_string(numRequests) << std::endl;\n+\tif (plannedRequests < buffers.size()) {\n+\t\tstd::cout << \"Camera needs \" << buffers.size()\n+\t\t\t << \" requests, can't test only \"\n+\t\t\t << plannedRequests << std::endl;\n \t\tGTEST_SKIP();\n \t}\n \n-\tqueueCount_ = 0;\n-\tcaptureCount_ = 0;\n-\tcaptureLimit_ = numRequests;\n-\n-\t/* Queue the recommended number of requests. */\n \tfor (const std::unique_ptr<FrameBuffer> &buffer : buffers) {\n \t\tstd::unique_ptr<Request> request = camera_->createRequest();\n \t\tASSERT_TRUE(request) << \"Can't create request\";\n \n \t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n \n-\t\tASSERT_EQ(queueRequest(request.get()), 0) << \"Failed to queue request\";\n-\n \t\trequests_.push_back(std::move(request));\n \t}\n+}\n+\n+/* CaptureBalanced */\n+\n+CaptureBalanced::CaptureBalanced(std::shared_ptr<Camera> camera)\n+\t: Capture(std::move(camera))\n+{\n+}\n+\n+void CaptureBalanced::capture(unsigned int numRequests)\n+{\n+\tstart();\n+\n+\tqueueCount_ = 0;\n+\tcaptureCount_ = 0;\n+\tcaptureLimit_ = numRequests;\n+\n+\tprepareRequests(numRequests);\n+\n+\tfor (const auto &request : requests_)\n+\t\tqueueRequest(request.get());\n \n \t/* Run capture session. */\n \tint status = result_.wait();\n@@ -156,23 +166,13 @@ void CaptureUnbalanced::capture(unsigned int numRequests)\n {\n \tstart();\n \n-\tStream *stream = config_->at(0).stream();\n-\tconst std::vector<std::unique_ptr<FrameBuffer>> &buffers = allocator_.buffers(stream);\n-\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of requests. */\n-\tfor (const std::unique_ptr<FrameBuffer> &buffer : buffers) {\n-\t\tstd::unique_ptr<Request> request = camera_->createRequest();\n-\t\tASSERT_TRUE(request) << \"Can't create request\";\n+\tprepareRequests(numRequests);\n \n-\t\tASSERT_EQ(request->addBuffer(stream, buffer.get()), 0) << \"Can't set buffer for request\";\n-\n-\t\tASSERT_EQ(camera_->queueRequest(request.get()), 0) << \"Failed to queue request\";\n-\n-\t\trequests_.push_back(std::move(request));\n-\t}\n+\tfor (const auto &request : requests_)\n+\t\tcamera_->queueRequest(request.get());\n \n \t/* Run capture session. */\n \tint status = result_.wait();\ndiff --git a/src/apps/lc-compliance/helpers/capture.h b/src/apps/lc-compliance/helpers/capture.h\nindex 8582ade8e..67c29021b 100644\n--- a/src/apps/lc-compliance/helpers/capture.h\n+++ b/src/apps/lc-compliance/helpers/capture.h\n@@ -26,6 +26,8 @@ protected:\n \tvoid start();\n \tvoid stop();\n \n+\tvoid prepareRequests(unsigned int plannedRequests);\n+\n \tvirtual void requestComplete(libcamera::Request *request) = 0;\n \n \tstd::shared_ptr<libcamera::Camera> camera_;\n", "prefixes": [ "RFC", "v1", "10/12" ] }