Patch Detail
Show a patch.
GET /api/patches/18027/?format=api
{ "id": 18027, "url": "https://patchwork.libcamera.org/api/patches/18027/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18027/", "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": "<20221216122939.256534-14-paul.elder@ideasonboard.com>", "date": "2022-12-16T12:29:34", "name": "[libcamera-devel,v9,13/18] lc-compliance: Factor common capture code into SimpleCapture", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c84b2a11db57bc4a480d0ce8cc5ac94e1835b0ea", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18027/mbox/", "series": [ { "id": 3675, "url": "https://patchwork.libcamera.org/api/series/3675/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3675", "date": "2022-12-16T12:29:21", "name": "lc-compliance: Add test to queue more requests than hardware depth", "version": 9, "mbox": "https://patchwork.libcamera.org/series/3675/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18027/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18027/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 D8347C31E9\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 16 Dec 2022 12:30:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8C008633AF;\n\tFri, 16 Dec 2022 13:30:26 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AB101633A4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 16 Dec 2022 13:30:24 +0100 (CET)", "from pyrite.tail37cf.ts.net (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4638E128D;\n\tFri, 16 Dec 2022 13:30:23 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1671193826;\n\tbh=VPXe7AwBiDzM/pQmANFAF8RGe93JNSnljJB4v1hFYsg=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=ZvBMJ01KJO0y9pp59xLTG3N9R6GegS99gaRB0ueo2twyvcmAOFq0X8u9T+C0inxJx\n\tri7j4cvJFiAPvCIqxA/Ta4/eS9BAXgTKFC+ZtiKHyC5R50z1FCcUsQK6E/vz1EiSeT\n\tyKs1AXZLwNdw25qzO8sZmheil1VLs2U3VGB8fd3/Vih2XI6s78GIxU6RyvXQ8t0yuQ\n\tyLjZjkGjQOvD/j/sW0AqZoMwlqYRZiM3vGIO6yEfgDtWHsKtp3Ak1Ghm8shi50fs8S\n\tWCbE+Bfr6jEDWAxX4nIXjfSYubNrN/oA7UT5MRf/BhQN+6vIM0JbpP6HAt4wHBWozi\n\t6HrIzBbkdsacA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1671193824;\n\tbh=VPXe7AwBiDzM/pQmANFAF8RGe93JNSnljJB4v1hFYsg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=sRlWnkfxNwXPj/7jx3JnNFptoqg2Tp+rumnK6vhYAwebCpYFNvvsXTfntWktffEHv\n\tBeatAxQIzL8UU99I5balh10gnROAHAGiUn4HlgLGAt5t4QacESuhU/pKr/Pj0EdBUr\n\tn9IpdPNhK3nRW229qvRDq3m9pP/dGvkq5ApuoK80=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"sRlWnkfx\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 16 Dec 2022 21:29:34 +0900", "Message-Id": "<20221216122939.256534-14-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20221216122939.256534-1-paul.elder@ideasonboard.com>", "References": "<20221216122939.256534-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v9 13/18] lc-compliance: Factor common\n\tcapture code into SimpleCapture", "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>", "From": "Paul Elder via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Paul Elder <paul.elder@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Nícolas F. R. A. Prado <nfraprado@collabora.com>\n\nFactor common code from SimpleCapture* subclasses into the SimpleCapture\nparent class in order to avoid duplicated code.\n\nSigned-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nChanges in v9:\n- rebased\n\nChanges in v8:\n- Added requests_ member to SimpleCapture to hold ownership of queued\n requests during capture\n- Made queueRequest() virtual and removed SimpleCaptureBalanced::queueRequests()\n\nChanges in v6:\n- Switched queueRequests()'s 'buffers' and 'requests' parameters order, since\n 'requests' is an output variable\n- Added comment to runCaptureSession()\n- Added missing blank line before return in captureCompleted()\n- Added blank line to runCaptureSession()\n---\n src/apps/lc-compliance/simple_capture.cpp | 89 +++++++++++++----------\n src/apps/lc-compliance/simple_capture.h | 15 ++--\n 2 files changed, 58 insertions(+), 46 deletions(-)", "diff": "diff --git a/src/apps/lc-compliance/simple_capture.cpp b/src/apps/lc-compliance/simple_capture.cpp\nindex 1e3e816a..6dd5c7af 100644\n--- a/src/apps/lc-compliance/simple_capture.cpp\n+++ b/src/apps/lc-compliance/simple_capture.cpp\n@@ -77,6 +77,49 @@ void SimpleCapture::stop()\n \tallocator_->free(stream);\n }\n \n+bool SimpleCapture::captureCompleted()\n+{\n+\tcaptureCount_++;\n+\tif (captureCount_ >= captureLimit_) {\n+\t\tloop_->exit(0);\n+\t\treturn true;\n+\t}\n+\n+\treturn false;\n+}\n+\n+int SimpleCapture::queueRequest(Request *request)\n+{\n+\treturn camera_->queueRequest(request);\n+}\n+\n+void SimpleCapture::queueRequests(Stream *stream,\n+\t\t\t\t const std::vector<std::unique_ptr<FrameBuffer>> &buffers)\n+{\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+int SimpleCapture::runCaptureSession()\n+{\n+\tloop_ = new EventLoop();\n+\tint status = loop_->exec();\n+\n+\t/* After session ended */\n+\tstop();\n+\tdelete loop_;\n+\n+\treturn status;\n+}\n+\n /* SimpleCaptureBalanced */\n \n SimpleCaptureBalanced::SimpleCaptureBalanced(std::shared_ptr<Camera> camera)\n@@ -103,23 +146,9 @@ void SimpleCaptureBalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\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+\tqueueRequests(stream, buffers);\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-\t/* Run capture session. */\n-\tloop_ = new EventLoop();\n-\tloop_->exec();\n-\tstop();\n-\tdelete loop_;\n+\trunCaptureSession();\n \n \tASSERT_EQ(captureCount_, captureLimit_);\n }\n@@ -135,11 +164,8 @@ int SimpleCaptureBalanced::queueRequest(Request *request)\n \n void SimpleCaptureBalanced::requestComplete(Request *request)\n {\n-\tcaptureCount_++;\n-\tif (captureCount_ >= captureLimit_) {\n-\t\tloop_->exit(0);\n+\tif (captureCompleted())\n \t\treturn;\n-\t}\n \n \trequest->reuse(Request::ReuseBuffers);\n \tif (queueRequest(request))\n@@ -163,34 +189,17 @@ void SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n \tcaptureCount_ = 0;\n \tcaptureLimit_ = numRequests;\n \n-\t/* Queue the recommended number of reqeuests. */\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+\tqueueRequests(stream, buffers);\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-\n-\t/* Run capture session. */\n-\tloop_ = new EventLoop();\n-\tint status = loop_->exec();\n-\tstop();\n-\tdelete loop_;\n+\tint status = runCaptureSession();\n \n \tASSERT_EQ(status, 0);\n }\n \n void SimpleCaptureUnbalanced::requestComplete(Request *request)\n {\n-\tcaptureCount_++;\n-\tif (captureCount_ >= captureLimit_) {\n-\t\tloop_->exit(0);\n+\tif (captureCompleted())\n \t\treturn;\n-\t}\n \n \trequest->reuse(Request::ReuseBuffers);\n \tif (camera_->queueRequest(request))\ndiff --git a/src/apps/lc-compliance/simple_capture.h b/src/apps/lc-compliance/simple_capture.h\nindex b3091547..89ecc71c 100644\n--- a/src/apps/lc-compliance/simple_capture.h\n+++ b/src/apps/lc-compliance/simple_capture.h\n@@ -25,11 +25,19 @@ protected:\n \n \tvoid start();\n \tvoid stop();\n+\tvirtual int queueRequest(libcamera::Request *request);\n+\tvoid queueRequests(libcamera::Stream *stream,\n+\t\t\t const std::vector<std::unique_ptr<libcamera::FrameBuffer>> &buffers);\n+\tbool captureCompleted();\n+\tint runCaptureSession();\n \n \tvirtual void requestComplete(libcamera::Request *request) = 0;\n \n \tEventLoop *loop_;\n \n+\tunsigned int captureCount_;\n+\tunsigned int captureLimit_;\n+\n \tstd::shared_ptr<libcamera::Camera> camera_;\n \tstd::unique_ptr<libcamera::FrameBufferAllocator> allocator_;\n \tstd::unique_ptr<libcamera::CameraConfiguration> config_;\n@@ -44,12 +52,10 @@ public:\n \tvoid capture(unsigned int numRequests);\n \n private:\n-\tint queueRequest(libcamera::Request *request);\n+\tint queueRequest(libcamera::Request *request) override;\n \tvoid requestComplete(libcamera::Request *request) override;\n \n \tunsigned int queueCount_;\n-\tunsigned int captureCount_;\n-\tunsigned int captureLimit_;\n };\n \n class SimpleCaptureUnbalanced : public SimpleCapture\n@@ -61,7 +67,4 @@ public:\n \n private:\n \tvoid requestComplete(libcamera::Request *request) override;\n-\n-\tunsigned int captureCount_;\n-\tunsigned int captureLimit_;\n };\n", "prefixes": [ "libcamera-devel", "v9", "13/18" ] }