{"id":18071,"url":"https://patchwork.libcamera.org/api/patches/18071/?format=json","web_url":"https://patchwork.libcamera.org/patch/18071/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20221228223003.2265712-16-paul.elder@ideasonboard.com>","date":"2022-12-28T22:29:59","name":"[libcamera-devel,v10,15/19] lc-compliance: Move camera setup to CameraHolder class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7ccaaa6ae16a0ea937c857779b2af8866a0f1ca7","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18071/mbox/","series":[{"id":3691,"url":"https://patchwork.libcamera.org/api/series/3691/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3691","date":"2022-12-28T22:29:44","name":"lc-compliance: Add test to queue more requests than hardware depth","version":10,"mbox":"https://patchwork.libcamera.org/series/3691/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18071/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18071/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 A8474C3291\n\tfor ;\n\tWed, 28 Dec 2022 22:30:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 54E7562608;\n\tWed, 28 Dec 2022 23:30:42 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6CF61625EF\n\tfor ;\n\tWed, 28 Dec 2022 23:30:36 +0100 (CET)","from pyrite.mediacom.info (unknown\n\t[IPv6:2604:2d80:ad8a:9000:1bf9:855b:22de:3645])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 02909109;\n\tWed, 28 Dec 2022 23:30:34 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1672266642;\n\tbh=WoN22LIegFrp62olPQq8QlNLCc0xK4dHM9kOmMmOYSw=;\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=3Y1rel1ZyxfE9fNwtNW/HB1aCvcmJcsi3u5XrcyFUGK0NnEEFTCs2SbUjnRoUzKbD\n\tCv/4UvkXueonkeCX6A7IDzOehaWhxZhWUQ/U0tsQv5sD64WU4VTPXN/p9DgiGLa36N\n\tiyQ0kpgeveMsJt+oqlY1PDBP+knN2sgd38mbYm+fnNZQ+7neazztDy6BxgFj76i9gy\n\t//cmGDajDaa6BRv36yipEXFyaUiigo6BODS+4VL2YZZZjpSZSROkhPuJcC9ZZkDa9g\n\t0CDHmYk51h1tiXpPDvQumrt7cSf5zM8HQA6GgKMlfGWcpDNPSoMT7DuV8Ol+6OCruw\n\tf62GhG+GZ2Xww==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1672266636;\n\tbh=WoN22LIegFrp62olPQq8QlNLCc0xK4dHM9kOmMmOYSw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=nT3Vkg6sZonncODwm62E9ouZTy+HT36k6xTIPajG8QRNUzieqHzzLM4yWSvpKyS9F\n\tyneCJQ8htGCk7L1anSlGdwQf2DVEDXVvaZG3mi0XrckxlFtkf+slwuQDUQoR/vXUZG\n\tJ/2kwVFCu9pqRT67mCwWKnI420Vjx57b4+Krdpgo="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"nT3Vkg6s\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 28 Dec 2022 16:29:59 -0600","Message-Id":"<20221228223003.2265712-16-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20221228223003.2265712-1-paul.elder@ideasonboard.com>","References":"<20221228223003.2265712-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v10 15/19] lc-compliance: Move camera\n\tsetup to CameraHolder class","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":"Paul Elder via libcamera-devel ","Reply-To":"Paul Elder ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Nícolas F. R. A. Prado \n\nDifferent base classes can be used for different setups on tests, but\nall of them will need to setup the camera for the test. To reuse that\ncode, move it to a separate CameraHolder class that is inherited by test\nclasses.\n\nSigned-off-by: Nícolas F. R. A. Prado \nReviewed-by: Laurent Pinchart \nReviewed-by: Paul Elder \nSigned-off-by: Paul Elder \n\n---\nChanges in v9:\n- rebased\n\nChanges in v8:\n- Moved CameraHolder to new test_base.{cpp,h} files\n\nChanges in v5:\n- New\n---\n src/apps/lc-compliance/capture_test.cpp | 18 ++++------------\n src/apps/lc-compliance/meson.build | 1 +\n src/apps/lc-compliance/test_base.cpp | 28 +++++++++++++++++++++++++\n src/apps/lc-compliance/test_base.h | 24 +++++++++++++++++++++\n 4 files changed, 57 insertions(+), 14 deletions(-)\n create mode 100644 src/apps/lc-compliance/test_base.cpp\n create mode 100644 src/apps/lc-compliance/test_base.h","diff":"diff --git a/src/apps/lc-compliance/capture_test.cpp b/src/apps/lc-compliance/capture_test.cpp\nindex 923395cf..2b82443a 100644\n--- a/src/apps/lc-compliance/capture_test.cpp\n+++ b/src/apps/lc-compliance/capture_test.cpp\n@@ -10,8 +10,8 @@\n \n #include \n \n-#include \"environment.h\"\n #include \"simple_capture.h\"\n+#include \"test_base.h\"\n \n using namespace libcamera;\n \n@@ -23,7 +23,7 @@ const std::vector ROLES = {\n \tStreamRole::Viewfinder\n };\n \n-class SingleStream : public testing::TestWithParam>\n+class SingleStream : public testing::TestWithParam>, public CameraHolder\n {\n public:\n \tstatic std::string nameParameters(const testing::TestParamInfo &info);\n@@ -31,8 +31,6 @@ public:\n protected:\n \tvoid SetUp() override;\n \tvoid TearDown() override;\n-\n-\tstd::shared_ptr camera_;\n };\n \n /*\n@@ -41,20 +39,12 @@ protected:\n */\n void SingleStream::SetUp()\n {\n-\tEnvironment *env = Environment::get();\n-\n-\tcamera_ = env->cm()->get(env->cameraId());\n-\n-\tASSERT_EQ(camera_->acquire(), 0);\n+\tacquireCamera();\n }\n \n void SingleStream::TearDown()\n {\n-\tif (!camera_)\n-\t\treturn;\n-\n-\tcamera_->release();\n-\tcamera_.reset();\n+\treleaseCamera();\n }\n \n std::string SingleStream::nameParameters(const testing::TestParamInfo &info)\ndiff --git a/src/apps/lc-compliance/meson.build b/src/apps/lc-compliance/meson.build\nindex 3b1927fd..fae290bb 100644\n--- a/src/apps/lc-compliance/meson.build\n+++ b/src/apps/lc-compliance/meson.build\n@@ -15,6 +15,7 @@ lc_compliance_sources = files([\n 'environment.cpp',\n 'main.cpp',\n 'simple_capture.cpp',\n+ 'test_base.cpp',\n ])\n \n lc_compliance = executable('lc-compliance', lc_compliance_sources,\ndiff --git a/src/apps/lc-compliance/test_base.cpp b/src/apps/lc-compliance/test_base.cpp\nnew file mode 100644\nindex 00000000..c9957b9e\n--- /dev/null\n+++ b/src/apps/lc-compliance/test_base.cpp\n@@ -0,0 +1,28 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2021, Collabora Ltd.\n+ *\n+ * test_base.cpp - Base definitions for tests\n+ */\n+\n+#include \"test_base.h\"\n+\n+#include \"environment.h\"\n+\n+void CameraHolder::acquireCamera()\n+{\n+\tEnvironment *env = Environment::get();\n+\n+\tcamera_ = env->cm()->get(env->cameraId());\n+\n+\tASSERT_EQ(camera_->acquire(), 0);\n+}\n+\n+void CameraHolder::releaseCamera()\n+{\n+\tif (!camera_)\n+\t\treturn;\n+\n+\tcamera_->release();\n+\tcamera_.reset();\n+}\ndiff --git a/src/apps/lc-compliance/test_base.h b/src/apps/lc-compliance/test_base.h\nnew file mode 100644\nindex 00000000..52347749\n--- /dev/null\n+++ b/src/apps/lc-compliance/test_base.h\n@@ -0,0 +1,24 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2021, Collabora Ltd.\n+ *\n+ * test_base.h - Base definitions for tests\n+ */\n+\n+#ifndef __LC_COMPLIANCE_TEST_BASE_H__\n+#define __LC_COMPLIANCE_TEST_BASE_H__\n+\n+#include \n+\n+#include \n+\n+class CameraHolder\n+{\n+protected:\n+\tvoid acquireCamera();\n+\tvoid releaseCamera();\n+\n+\tstd::shared_ptr camera_;\n+};\n+\n+#endif /* __LC_COMPLIANCE_TEST_BASE_H__ */\n","prefixes":["libcamera-devel","v10","15/19"]}