{"id":19348,"url":"https://patchwork.libcamera.org/api/1.1/patches/19348/?format=json","web_url":"https://patchwork.libcamera.org/patch/19348/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20231223111023.668199-5-jacopo.mondi@ideasonboard.com>","date":"2023-12-23T11:10:22","name":"[libcamera-devel,v2,4/5] apps: lc-compliance: Re-organize source directory","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"53389fc9ddfbb18b75447317bcd9cb931d5ff208","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/1.1/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19348/mbox/","series":[{"id":4127,"url":"https://patchwork.libcamera.org/api/1.1/series/4127/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4127","date":"2023-12-23T11:10:18","name":"apps: lc-compliance: Add controls and properties test","version":2,"mbox":"https://patchwork.libcamera.org/series/4127/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19348/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19348/checks/","tags":{},"headers":{"Return-Path":"","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 D36CAC32BD\n\tfor ;\n\tSat, 23 Dec 2023 11:10:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3FEB662B5F;\n\tSat, 23 Dec 2023 12:10:41 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AD69762B4A\n\tfor ;\n\tSat, 23 Dec 2023 12:10:36 +0100 (CET)","from localhost.localdomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5D9AEFF3;\n\tSat, 23 Dec 2023 12:09:44 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1703329841;\n\tbh=wAxlakPy353QsBJfhvYiGepVDOexcUVy88tbj9z6DxY=;\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:Cc:\n\tFrom;\n\tb=f6jcCNpW5dcbO66wEp9lTxQLV+y2FFzXM22fzS9zcXItHpgIi4h1plCZLYY0Vfwn+\n\tuQjxgpk8UyyOJN83tI3FjZiR20syGXvF3LN2jxP+olXaxt74+xGLTmfpy+H66x+1za\n\tXKACooWM1wTu1BpuiMZ9Xuk1IM25vsigUgEmrjyBocZSJvpSUji6BQqyptqragD3RZ\n\tqdQH0mmVPIJKT8rYXAe0vG+FIUZ6XOY6wls/0vctYxEMXu5liLO3oS4en9ZH4BT6d8\n\tFlb7KlIpFY2OXkaZwlmwtss0DFk+mn9nGBJnBKgMqi/utQBFxEltsyIcSoO+EYu0Rm\n\t0EEXkNK0lylDQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1703329784;\n\tbh=wAxlakPy353QsBJfhvYiGepVDOexcUVy88tbj9z6DxY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VmbT8NvT/jPAViLYuLQ7mGNSQikeHa9gMAp2wIqqphiVORMNFzIkBK1cdBkvdwRKW\n\to4auyJJLHpiBsZqT81wu0sLrHqwBNI3EV5pQFkNTpuAd3p4O037Z9yRCO97Pz2wV6D\n\tBOGjvRmG+OWyRZcf9k8EtYliv5j1+cllHP/ZPTQI="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"VmbT8NvT\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 23 Dec 2023 12:10:22 +0100","Message-ID":"<20231223111023.668199-5-jacopo.mondi@ideasonboard.com>","X-Mailer":"git-send-email 2.41.0","In-Reply-To":"<20231223111023.668199-1-jacopo.mondi@ideasonboard.com>","References":"<20231223111023.668199-1-jacopo.mondi@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 4/5] apps: lc-compliance: Re-organize\n\tsource directory","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"Jacopo Mondi ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Before adding more tests and more helper classes to lc-compliance,\nreorganize the source tree to split test and helpers in two separate\ndirectories.\n\nWhile at it, rename the 'SimpleCapture' class and its derived classes to\njust 'Capture'. Rename the source files accordingly.\n\nRe-sort headers inclusions to please checkstyle.py too.\n\nSigned-off-by: Jacopo Mondi \n---\n .../capture.cpp} | 38 +++++++++----------\n .../{simple_capture.h => helpers/capture.h} | 14 +++----\n src/apps/lc-compliance/meson.build | 10 ++++-\n .../{ => tests}/capture_test.cpp | 9 +++--\n 4 files changed, 39 insertions(+), 32 deletions(-)\n rename src/apps/lc-compliance/{simple_capture.cpp => helpers/capture.cpp} (81%)\n rename src/apps/lc-compliance/{simple_capture.h => helpers/capture.h} (76%)\n rename src/apps/lc-compliance/{ => tests}/capture_test.cpp (95%)","diff":"diff --git a/src/apps/lc-compliance/simple_capture.cpp b/src/apps/lc-compliance/helpers/capture.cpp\nsimilarity index 81%\nrename from src/apps/lc-compliance/simple_capture.cpp\nrename to src/apps/lc-compliance/helpers/capture.cpp\nindex 545b444c2593..5aab973f0392 100644\n--- a/src/apps/lc-compliance/simple_capture.cpp\n+++ b/src/apps/lc-compliance/helpers/capture.cpp\n@@ -5,24 +5,24 @@\n * simple_capture.cpp - Simple capture helper\n */\n \n-#include \n+#include \"capture.h\"\n \n-#include \"simple_capture.h\"\n+#include \n \n using namespace libcamera;\n \n-SimpleCapture::SimpleCapture(std::shared_ptr camera)\n+Capture::Capture(std::shared_ptr camera)\n \t: loop_(nullptr), camera_(camera),\n \t allocator_(std::make_unique(camera))\n {\n }\n \n-SimpleCapture::~SimpleCapture()\n+Capture::~Capture()\n {\n \tstop();\n }\n \n-void SimpleCapture::configure(StreamRole role)\n+void Capture::configure(StreamRole role)\n {\n \tconfig_ = camera_->generateConfiguration({ role });\n \n@@ -42,7 +42,7 @@ void SimpleCapture::configure(StreamRole role)\n \t}\n }\n \n-void SimpleCapture::start()\n+void Capture::start()\n {\n \tStream *stream = config_->at(0).stream();\n \tint count = allocator_->allocate(stream);\n@@ -50,12 +50,12 @@ void SimpleCapture::start()\n \tASSERT_GE(count, 0) << \"Failed to allocate buffers\";\n \tEXPECT_EQ(count, config_->at(0).bufferCount) << \"Allocated less buffers than expected\";\n \n-\tcamera_->requestCompleted.connect(this, &SimpleCapture::requestComplete);\n+\tcamera_->requestCompleted.connect(this, &Capture::requestComplete);\n \n \tASSERT_EQ(camera_->start(), 0) << \"Failed to start camera\";\n }\n \n-void SimpleCapture::stop()\n+void Capture::stop()\n {\n \tif (!config_ || !allocator_->allocated())\n \t\treturn;\n@@ -69,14 +69,14 @@ void SimpleCapture::stop()\n \tallocator_->free(stream);\n }\n \n-/* SimpleCaptureBalanced */\n+/* CaptureBalanced */\n \n-SimpleCaptureBalanced::SimpleCaptureBalanced(std::shared_ptr camera)\n-\t: SimpleCapture(camera)\n+CaptureBalanced::CaptureBalanced(std::shared_ptr camera)\n+\t: Capture(camera)\n {\n }\n \n-void SimpleCaptureBalanced::capture(unsigned int numRequests)\n+void CaptureBalanced::capture(unsigned int numRequests)\n {\n \tstart();\n \n@@ -116,7 +116,7 @@ void SimpleCaptureBalanced::capture(unsigned int numRequests)\n \tASSERT_EQ(captureCount_, captureLimit_);\n }\n \n-int SimpleCaptureBalanced::queueRequest(Request *request)\n+int CaptureBalanced::queueRequest(Request *request)\n {\n \tqueueCount_++;\n \tif (queueCount_ > captureLimit_)\n@@ -125,7 +125,7 @@ int SimpleCaptureBalanced::queueRequest(Request *request)\n \treturn camera_->queueRequest(request);\n }\n \n-void SimpleCaptureBalanced::requestComplete(Request *request)\n+void CaptureBalanced::requestComplete(Request *request)\n {\n \tEXPECT_EQ(request->status(), Request::Status::RequestComplete)\n \t\t<< \"Request didn't complete successfully\";\n@@ -141,14 +141,14 @@ void SimpleCaptureBalanced::requestComplete(Request *request)\n \t\tloop_->exit(-EINVAL);\n }\n \n-/* SimpleCaptureUnbalanced */\n+/* CaptureUnbalanced */\n \n-SimpleCaptureUnbalanced::SimpleCaptureUnbalanced(std::shared_ptr camera)\n-\t: SimpleCapture(camera)\n+CaptureUnbalanced::CaptureUnbalanced(std::shared_ptr camera)\n+\t: Capture(camera)\n {\n }\n \n-void SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n+void CaptureUnbalanced::capture(unsigned int numRequests)\n {\n \tstart();\n \n@@ -179,7 +179,7 @@ void SimpleCaptureUnbalanced::capture(unsigned int numRequests)\n \tASSERT_EQ(status, 0);\n }\n \n-void SimpleCaptureUnbalanced::requestComplete(Request *request)\n+void CaptureUnbalanced::requestComplete(Request *request)\n {\n \tcaptureCount_++;\n \tif (captureCount_ >= captureLimit_) {\ndiff --git a/src/apps/lc-compliance/simple_capture.h b/src/apps/lc-compliance/helpers/capture.h\nsimilarity index 76%\nrename from src/apps/lc-compliance/simple_capture.h\nrename to src/apps/lc-compliance/helpers/capture.h\nindex 2911d6019923..0574ab1c7ac7 100644\n--- a/src/apps/lc-compliance/simple_capture.h\n+++ b/src/apps/lc-compliance/helpers/capture.h\n@@ -13,14 +13,14 @@\n \n #include \"../common/event_loop.h\"\n \n-class SimpleCapture\n+class Capture\n {\n public:\n \tvoid configure(libcamera::StreamRole role);\n \n protected:\n-\tSimpleCapture(std::shared_ptr camera);\n-\tvirtual ~SimpleCapture();\n+\tCapture(std::shared_ptr camera);\n+\tvirtual ~Capture();\n \n \tvoid start();\n \tvoid stop();\n@@ -35,10 +35,10 @@ protected:\n \tstd::vector> requests_;\n };\n \n-class SimpleCaptureBalanced : public SimpleCapture\n+class CaptureBalanced : public Capture\n {\n public:\n-\tSimpleCaptureBalanced(std::shared_ptr camera);\n+\tCaptureBalanced(std::shared_ptr camera);\n \n \tvoid capture(unsigned int numRequests);\n \n@@ -51,10 +51,10 @@ private:\n \tunsigned int captureLimit_;\n };\n \n-class SimpleCaptureUnbalanced : public SimpleCapture\n+class CaptureUnbalanced : public Capture\n {\n public:\n-\tSimpleCaptureUnbalanced(std::shared_ptr camera);\n+\tCaptureUnbalanced(std::shared_ptr camera);\n \n \tvoid capture(unsigned int numRequests);\n \ndiff --git a/src/apps/lc-compliance/meson.build b/src/apps/lc-compliance/meson.build\nindex 2f07a50f171b..ae8c6f4db51b 100644\n--- a/src/apps/lc-compliance/meson.build\n+++ b/src/apps/lc-compliance/meson.build\n@@ -11,10 +11,15 @@ endif\n lc_compliance_enabled = true\n \n lc_compliance_sources = files([\n- 'capture_test.cpp',\n 'environment.cpp',\n+ 'helpers/capture.cpp',\n 'main.cpp',\n- 'simple_capture.cpp',\n+ 'tests/capture_test.cpp',\n+])\n+\n+lc_compliance_includes = ([\n+ include_directories('.'),\n+ include_directories('helpers/')\n ])\n \n lc_compliance = executable('lc-compliance', lc_compliance_sources,\n@@ -26,5 +31,6 @@ lc_compliance = executable('lc-compliance', lc_compliance_sources,\n libevent,\n libgtest,\n ],\n+ include_directories : lc_compliance_includes,\n install : true,\n install_tag : 'bin-devel')\ndiff --git a/src/apps/lc-compliance/capture_test.cpp b/src/apps/lc-compliance/tests/capture_test.cpp\nsimilarity index 95%\nrename from src/apps/lc-compliance/capture_test.cpp\nrename to src/apps/lc-compliance/tests/capture_test.cpp\nindex 1dcfcf92fc8c..284d36307619 100644\n--- a/src/apps/lc-compliance/capture_test.cpp\n+++ b/src/apps/lc-compliance/tests/capture_test.cpp\n@@ -6,12 +6,13 @@\n * capture_test.cpp - Test camera capture\n */\n \n+#include \"capture.h\"\n+\n #include \n \n #include \n \n #include \"environment.h\"\n-#include \"simple_capture.h\"\n \n using namespace libcamera;\n \n@@ -83,7 +84,7 @@ TEST_P(SingleStream, Capture)\n {\n \tauto [role, numRequests] = GetParam();\n \n-\tSimpleCaptureBalanced capture(camera_);\n+\tCaptureBalanced capture(camera_);\n \n \tcapture.configure(role);\n \n@@ -102,7 +103,7 @@ TEST_P(SingleStream, CaptureStartStop)\n \tauto [role, numRequests] = GetParam();\n \tunsigned int numRepeats = 3;\n \n-\tSimpleCaptureBalanced capture(camera_);\n+\tCaptureBalanced capture(camera_);\n \n \tcapture.configure(role);\n \n@@ -121,7 +122,7 @@ TEST_P(SingleStream, UnbalancedStop)\n {\n \tauto [role, numRequests] = GetParam();\n \n-\tSimpleCaptureUnbalanced capture(camera_);\n+\tCaptureUnbalanced capture(camera_);\n \n \tcapture.configure(role);\n \n","prefixes":["libcamera-devel","v2","4/5"]}