Patch Detail
Show a patch.
GET /api/1.1/patches/11881/?format=api
{ "id": 11881, "url": "https://patchwork.libcamera.org/api/1.1/patches/11881/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11881/", "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": "<20210409150037.1440033-3-niklas.soderlund@ragnatech.se>", "date": "2021-04-09T15:00:37", "name": "[libcamera-devel,v5,2/2] lc-compliance: Add test stopping single stream with requests queued", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8a3b39fd04cd4cad29d2c1ec8971a8eb370b315f", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11881/mbox/", "series": [ { "id": 1907, "url": "https://patchwork.libcamera.org/api/1.1/series/1907/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1907", "date": "2021-04-09T15:00:35", "name": "lc-compliance: Add a libcamera compliance tool", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1907/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11881/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11881/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 C5874BD1F6\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 9 Apr 2021 15:01:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8D79168804;\n\tFri, 9 Apr 2021 17:01:05 +0200 (CEST)", "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 57B3B687FF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 9 Apr 2021 17:01:03 +0200 (CEST)", "from bismarck.berto.se (p54ac5521.dip0.t-ipconnect.de\n\t[84.172.85.33])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 665da5b8-9944-11eb-b73f-0050569116f7;\n\tFri, 09 Apr 2021 17:01:02 +0200 (CEST)" ], "X-Halon-ID": "665da5b8-9944-11eb-b73f-0050569116f7", "Authorized-sender": "niklas.soderlund@fsdn.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 9 Apr 2021 17:00:37 +0200", "Message-Id": "<20210409150037.1440033-3-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210409150037.1440033-1-niklas.soderlund@ragnatech.se>", "References": "<20210409150037.1440033-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v5 2/2] lc-compliance: Add test stopping\n\tsingle stream with requests queued", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a test which stops a camera while requests are still queued. This\nintends to test cleanup paths where requests are dequeued from video\ndevices in an uncompleted state.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nAcked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nTested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n* Changes since v4\n- Update commit message.\n---\n src/lc-compliance/simple_capture.cpp | 63 ++++++++++++++++++++++++++++\n src/lc-compliance/simple_capture.h | 14 +++++++\n src/lc-compliance/single_stream.cpp | 25 ++++++++++-\n 3 files changed, 101 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/lc-compliance/simple_capture.cpp b/src/lc-compliance/simple_capture.cpp\nindex 389dc11fc60225c5..0ff720bfd0052e45 100644\n--- a/src/lc-compliance/simple_capture.cpp\n+++ b/src/lc-compliance/simple_capture.cpp\n@@ -149,3 +149,66 @@ void SimpleCaptureBalanced::requestComplete(Request *request)\n \tif (queueRequest(request))\n \t\tloop_->exit(-EINVAL);\n }\n+\n+/* SimpleCaptureUnbalanced */\n+\n+SimpleCaptureUnbalanced::SimpleCaptureUnbalanced(std::shared_ptr<Camera> camera)\n+\t: SimpleCapture(camera)\n+{\n+}\n+\n+Results::Result SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n+{\n+\tResults::Result ret = start();\n+\tif (ret.first != Results::Pass)\n+\t\treturn ret;\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 reqeuests. */\n+\tstd::vector<std::unique_ptr<libcamera::Request>> requests;\n+\tfor (const std::unique_ptr<FrameBuffer> &buffer : buffers) {\n+\t\tstd::unique_ptr<Request> request = camera_->createRequest();\n+\t\tif (!request) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Can't create request\" };\n+\t\t}\n+\n+\t\tif (request->addBuffer(stream, buffer.get())) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Can't set buffer for request\" };\n+\t\t}\n+\n+\t\tif (camera_->queueRequest(request.get()) < 0) {\n+\t\t\tstop();\n+\t\t\treturn { Results::Fail, \"Failed to queue request\" };\n+\t\t}\n+\n+\t\trequests.push_back(std::move(request));\n+\t}\n+\n+\t/* Run capture session. */\n+\tloop_ = new EventLoop();\n+\tint status = loop_->exec();\n+\tstop();\n+\tdelete loop_;\n+\n+\treturn { status ? Results::Fail : Results::Pass, \"Unbalanced capture of \" + std::to_string(numRequests) + \" requests\" };\n+}\n+\n+void SimpleCaptureUnbalanced::requestComplete(Request *request)\n+{\n+\tcaptureCount_++;\n+\tif (captureCount_ >= captureLimit_) {\n+\t\tloop_->exit(0);\n+\t\treturn;\n+\t}\n+\n+\trequest->reuse(Request::ReuseBuffers);\n+\tif (camera_->queueRequest(request))\n+\t\tloop_->exit(-EINVAL);\n+}\ndiff --git a/src/lc-compliance/simple_capture.h b/src/lc-compliance/simple_capture.h\nindex 3a6afc538c623050..4693c13404cee7d2 100644\n--- a/src/lc-compliance/simple_capture.h\n+++ b/src/lc-compliance/simple_capture.h\n@@ -51,4 +51,18 @@ private:\n \tunsigned int captureLimit_;\n };\n \n+class SimpleCaptureUnbalanced : public SimpleCapture\n+{\n+public:\n+\tSimpleCaptureUnbalanced(std::shared_ptr<libcamera::Camera> camera);\n+\n+\tResults::Result capture(unsigned int numRequests);\n+\n+private:\n+\tvoid requestComplete(libcamera::Request *request) override;\n+\n+\tunsigned int captureCount_;\n+\tunsigned int captureLimit_;\n+};\n+\n #endif /* __LC_COMPLIANCE_SIMPLE_CAPTURE_H__ */\ndiff --git a/src/lc-compliance/single_stream.cpp b/src/lc-compliance/single_stream.cpp\nindex e9ca1d58ecb959cd..8318b42f42d640aa 100644\n--- a/src/lc-compliance/single_stream.cpp\n+++ b/src/lc-compliance/single_stream.cpp\n@@ -33,6 +33,18 @@ Results::Result testRequestBalance(std::shared_ptr<Camera> camera,\n \t\tstd::to_string(startCycles) + \" start cycles\" };\n }\n \n+Results::Result testRequestUnbalance(std::shared_ptr<Camera> camera,\n+\t\t\t\t StreamRole role, unsigned int numRequests)\n+{\n+\tSimpleCaptureUnbalanced capture(camera);\n+\n+\tResults::Result ret = capture.configure(role);\n+\tif (ret.first != Results::Pass)\n+\t\treturn ret;\n+\n+\treturn capture.capture(numRequests);\n+}\n+\n Results testSingleStream(std::shared_ptr<Camera> camera)\n {\n \tstatic const std::vector<std::pair<std::string, StreamRole>> roles = {\n@@ -43,7 +55,7 @@ Results testSingleStream(std::shared_ptr<Camera> camera)\n \t};\n \tstatic const std::vector<unsigned int> numRequests = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89 };\n \n-\tResults results(numRequests.size() * roles.size() * 2);\n+\tResults results(numRequests.size() * roles.size() * 3);\n \n \tfor (const auto &role : roles) {\n \t\tstd::cout << \"= Test role \" << role.first << std::endl;\n@@ -68,6 +80,17 @@ Results testSingleStream(std::shared_ptr<Camera> camera)\n \t\tstd::cout << \"* Test multiple start/stop cycles\" << std::endl;\n \t\tfor (unsigned int num : numRequests)\n \t\t\tresults.add(testRequestBalance(camera, role.second, 3, num));\n+\n+\t\t/*\n+\t\t * Test unbalanced stop\n+\t\t *\n+\t\t * Makes sure the camera supports a stop with requests queued.\n+\t\t * Example failure is a camera that does not handle cancelation\n+\t\t * of buffers coming back from the video device while stopping.\n+\t\t */\n+\t\tstd::cout << \"* Test unbalanced stop\" << std::endl;\n+\t\tfor (unsigned int num : numRequests)\n+\t\t\tresults.add(testRequestUnbalance(camera, role.second, num));\n \t}\n \n \treturn results;\n", "prefixes": [ "libcamera-devel", "v5", "2/2" ] }