{"id":12749,"url":"https://patchwork.libcamera.org/api/1.1/patches/12749/?format=json","web_url":"https://patchwork.libcamera.org/patch/12749/","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":"<20210629151218.248650-4-nfraprado@collabora.com>","date":"2021-06-29T15:12:16","name":"[libcamera-devel,v10,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/1.1/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12749/mbox/","series":[{"id":2192,"url":"https://patchwork.libcamera.org/api/1.1/series/2192/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2192","date":"2021-06-29T15:12:13","name":"lc-compliance: Refactor using Googletest","version":10,"mbox":"https://patchwork.libcamera.org/series/2192/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12749/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12749/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 CDFE5C321F\n\tfor ;\n\tTue, 29 Jun 2021 15:13:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 98D30684ED;\n\tTue, 29 Jun 2021 17:13:13 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 215B8684D5\n\tfor ;\n\tTue, 29 Jun 2021 17:13:12 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2804:14c:1a9:2434:bd70:78a1:919c:f01a])\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 762F81F430B2;\n\tTue, 29 Jun 2021 16:13:10 +0100 (BST)"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 29 Jun 2021 12:12:16 -0300","Message-Id":"<20210629151218.248650-4-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210629151218.248650-1-nfraprado@collabora.com>","References":"<20210629151218.248650-1-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v10 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---\nNo changes in v10\n\nNo changes in v9\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 f3a7cbdec4f8..3e7bdb032843 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","v10","3/5"]}