{"id":12613,"url":"https://patchwork.libcamera.org/api/patches/12613/?format=json","web_url":"https://patchwork.libcamera.org/patch/12613/","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":"<20210616132535.453411-4-nfraprado@collabora.com>","date":"2021-06-16T13:25:33","name":"[libcamera-devel,v8,3/5] lc-compliance: Add Environment singleton","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8d6f3d4cad4e9296a5253259cdaa9ea01d7d4957","submitter":{"id":84,"url":"https://patchwork.libcamera.org/api/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12613/mbox/","series":[{"id":2141,"url":"https://patchwork.libcamera.org/api/series/2141/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2141","date":"2021-06-16T13:25:30","name":"lc-compliance: Refactor using Googletest","version":8,"mbox":"https://patchwork.libcamera.org/series/2141/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12613/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12613/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 E7E12BD78E\n\tfor ;\n\tWed, 16 Jun 2021 13:26:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B8A0568949;\n\tWed, 16 Jun 2021 15:26:47 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E2B906029A\n\tfor ;\n\tWed, 16 Jun 2021 15:26:46 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2434:2243:2b27:a2be:44ab])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits))\n\t(No client certificate requested) (Authenticated sender: nfraprado)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id ED8BF1F43723;\n\tWed, 16 Jun 2021 14:26:44 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 16 Jun 2021 10:25:33 -0300","Message-Id":"<20210616132535.453411-4-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210616132535.453411-1-nfraprado@collabora.com>","References":"<20210616132535.453411-1-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v8 3/5] lc-compliance: Add Environment\n\tsingleton","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","Cc":"kernel@collabora.com, =?utf-8?q?Andr=C3=A9_Almeida?=\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a singleton Environment class in order to make the camera available\ninside all tests. This is needed for the Googletest refactor, otherwise\nthe tests, which are statically declared, won't be able to access the\ncamera.\n\nSigned-off-by: Nícolas F. R. A. Prado \nReviewed-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\nChanges in v8:\n- Thanks to Laurent:\n - Fixed compiling error in Clang\n- Thanks to Kieran:\n - Fixed coding style issues\n\nChanges in v7:\n- Thanks to Jacopo:\n - Fixed style issue\n - Made CameraManager a unique_ptr and passed to Environment as raw pointer\n\nChanges in v6:\n- Thanks to Niklas:\n - Made cameraId() return const& \n\nChanges in v5:\n- Thanks to Laurent:\n - Stored CameraManager and cameraId instead of Camera in Environment\n- Thanks to Laurent & Niklas:\n - Improved Environment singleton class instantiation and destruction\n\nAdded in v4\n\n src/lc-compliance/environment.cpp | 20 ++++++++++++++++++++\n src/lc-compliance/environment.h | 31 +++++++++++++++++++++++++++++++\n src/lc-compliance/meson.build | 1 +\n 3 files changed, 52 insertions(+)\n create mode 100644 src/lc-compliance/environment.cpp\n create mode 100644 src/lc-compliance/environment.h","diff":"diff --git a/src/lc-compliance/environment.cpp b/src/lc-compliance/environment.cpp\nnew file mode 100644\nindex 000000000000..9e24b5e34e4a\n--- /dev/null\n+++ b/src/lc-compliance/environment.cpp\n@@ -0,0 +1,20 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2021, Collabora Ltd.\n+ *\n+ * environment.cpp - Common environment for tests\n+ */\n+\n+#include \"environment.h\"\n+\n+Environment *Environment::get()\n+{\n+\tstatic Environment instance;\n+\treturn &instance;\n+}\n+\n+void Environment::setup(CameraManager *cm, std::string cameraId)\n+{\n+\tcm_ = cm;\n+\tcameraId_ = cameraId;\n+}\ndiff --git a/src/lc-compliance/environment.h b/src/lc-compliance/environment.h\nnew file mode 100644\nindex 000000000000..1c7d9a558dc2\n--- /dev/null\n+++ b/src/lc-compliance/environment.h\n@@ -0,0 +1,31 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2021, Collabora Ltd.\n+ *\n+ * environment.h - Common environment for tests\n+ */\n+#ifndef __LC_COMPLIANCE_ENVIRONMENT_H__\n+#define __LC_COMPLIANCE_ENVIRONMENT_H__\n+\n+#include \n+\n+using namespace libcamera;\n+\n+class Environment\n+{\n+public:\n+\tstatic Environment *get();\n+\n+\tvoid setup(CameraManager *cm, std::string cameraId);\n+\n+\tconst std::string &cameraId() const { return cameraId_; }\n+\tCameraManager *cm() const { return cm_; }\n+\n+private:\n+\tEnvironment() = default;\n+\n+\tstd::string cameraId_;\n+\tCameraManager *cm_;\n+};\n+\n+#endif /* __LC_COMPLIANCE_ENVIRONMENT_H__ */\ndiff --git a/src/lc-compliance/meson.build b/src/lc-compliance/meson.build\nindex a2bfcceb1259..6dd49085569f 100644\n--- a/src/lc-compliance/meson.build\n+++ b/src/lc-compliance/meson.build\n@@ -12,6 +12,7 @@ lc_compliance_enabled = true\n lc_compliance_sources = files([\n '../cam/event_loop.cpp',\n '../cam/options.cpp',\n+ 'environment.cpp',\n 'main.cpp',\n 'results.cpp',\n 'simple_capture.cpp',\n","prefixes":["libcamera-devel","v8","3/5"]}