{"id":13092,"url":"https://patchwork.libcamera.org/api/1.1/patches/13092/?format=json","web_url":"https://patchwork.libcamera.org/patch/13092/","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":"<20210723040036.32346-7-laurent.pinchart@ideasonboard.com>","date":"2021-07-23T04:00:25","name":"[libcamera-devel,RFC,06/17] libcamera: camera: Move Camera::Private to header file","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6c05bb21a8f9057c4cf0c981c5e203de6af1c711","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13092/mbox/","series":[{"id":2270,"url":"https://patchwork.libcamera.org/api/1.1/series/2270/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2270","date":"2021-07-23T04:00:19","name":"libcamera: Replace CameraData with Camera::Private","version":1,"mbox":"https://patchwork.libcamera.org/series/2270/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13092/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13092/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 7476FC322C\n\tfor ;\n\tFri, 23 Jul 2021 04:00:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1012A687C0;\n\tFri, 23 Jul 2021 06:00:51 +0200 (CEST)","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 01E166877A\n\tfor ;\n\tFri, 23 Jul 2021 06:00:45 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 99F8F255\n\tfor ;\n\tFri, 23 Jul 2021 06:00:44 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"pJwx6V/8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627012844;\n\tbh=hZHmJc1F8VeVoHYny0nzxnMLTmz4eq976ToNO+jehXQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=pJwx6V/8cfvRrwc3V1ef2d9CDTtRnf1owUljqpvNKNEGsn8gs7LSFAkOvVBeNwcqc\n\tDcPKyre27BJVbREzfeRXu0AS2kS69y56dGoniywI3om6pxDwEOCT48706iKmnP5cWE\n\tT5S+WFeCx4WKRm3LfwdixtrKiOoV+HnhFdWA8xb8=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 23 Jul 2021 07:00:25 +0300","Message-Id":"<20210723040036.32346-7-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210723040036.32346-1-laurent.pinchart@ideasonboard.com>","References":"<20210723040036.32346-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH 06/17] libcamera: camera: Move\n\tCamera::Private to header file","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Camera::Private class is defined in camera.cpp. To prepare for\nallowing it to be subclassed by pipeline handlers, move it to a new\ninternal/camera.h header.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/internal/camera.h | 63 ++++++++++++++++++++++++++\n include/libcamera/internal/meson.build | 1 +\n src/libcamera/camera.cpp | 40 +---------------\n 3 files changed, 66 insertions(+), 38 deletions(-)\n create mode 100644 include/libcamera/internal/camera.h","diff":"diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h\nnew file mode 100644\nindex 000000000000..9ef5d8ae98a6\n--- /dev/null\n+++ b/include/libcamera/internal/camera.h\n@@ -0,0 +1,63 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Google Inc.\n+ *\n+ * camera.h - Camera private data\n+ */\n+#ifndef __LIBCAMERA_INTERNAL_CAMERA_H__\n+#define __LIBCAMERA_INTERNAL_CAMERA_H__\n+\n+#include \n+#include \n+#include \n+#include \n+\n+#include \n+\n+#include \n+\n+namespace libcamera {\n+\n+class PipelineHandler;\n+class Stream;\n+\n+class Camera::Private : public Extensible::Private\n+{\n+\tLIBCAMERA_DECLARE_PUBLIC(Camera)\n+\n+public:\n+\tenum State {\n+\t\tCameraAvailable,\n+\t\tCameraAcquired,\n+\t\tCameraConfigured,\n+\t\tCameraStopping,\n+\t\tCameraRunning,\n+\t};\n+\n+\tPrivate(PipelineHandler *pipe, const std::string &id,\n+\t\tconst std::set &streams);\n+\t~Private();\n+\n+\tbool isRunning() const;\n+\tint isAccessAllowed(State state, bool allowDisconnected = false,\n+\t\t\t const char *from = __builtin_FUNCTION()) const;\n+\tint isAccessAllowed(State low, State high,\n+\t\t\t bool allowDisconnected = false,\n+\t\t\t const char *from = __builtin_FUNCTION()) const;\n+\n+\tvoid disconnect();\n+\tvoid setState(State state);\n+\n+\tstd::shared_ptr pipe_;\n+\tstd::string id_;\n+\tstd::set streams_;\n+\tstd::set activeStreams_;\n+\n+private:\n+\tbool disconnected_;\n+\tstd::atomic state_;\n+};\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_INTERNAL_CAMERA_H__ */\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 6d4eb7ed3df6..dac1a2d36fa8 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -12,6 +12,7 @@ libcamera_tracepoint_header = custom_target(\n libcamera_internal_headers = files([\n 'bayer_format.h',\n 'byte_stream_buffer.h',\n+ 'camera.h',\n 'camera_controls.h',\n 'camera_sensor.h',\n 'camera_sensor_properties.h',\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex c126b49290ce..4b5bc891fc37 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -18,10 +18,11 @@\n #include \n #include \n \n+#include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n \n /**\n- * \\file camera.h\n+ * \\file libcamera/camera.h\n * \\brief Camera device handling\n *\n * \\page camera-model Camera Model\n@@ -331,43 +332,6 @@ std::size_t CameraConfiguration::size() const\n * \\brief The vector of stream configurations\n */\n \n-class Camera::Private : public Extensible::Private\n-{\n-\tLIBCAMERA_DECLARE_PUBLIC(Camera)\n-\n-public:\n-\tenum State {\n-\t\tCameraAvailable,\n-\t\tCameraAcquired,\n-\t\tCameraConfigured,\n-\t\tCameraStopping,\n-\t\tCameraRunning,\n-\t};\n-\n-\tPrivate(PipelineHandler *pipe, const std::string &id,\n-\t\tconst std::set &streams);\n-\t~Private();\n-\n-\tbool isRunning() const;\n-\tint isAccessAllowed(State state, bool allowDisconnected = false,\n-\t\t\t const char *from = __builtin_FUNCTION()) const;\n-\tint isAccessAllowed(State low, State high,\n-\t\t\t bool allowDisconnected = false,\n-\t\t\t const char *from = __builtin_FUNCTION()) const;\n-\n-\tvoid disconnect();\n-\tvoid setState(State state);\n-\n-\tstd::shared_ptr pipe_;\n-\tstd::string id_;\n-\tstd::set streams_;\n-\tstd::set activeStreams_;\n-\n-private:\n-\tbool disconnected_;\n-\tstd::atomic state_;\n-};\n-\n Camera::Private::Private(PipelineHandler *pipe,\n \t\t\t const std::string &id,\n \t\t\t const std::set &streams)\n","prefixes":["libcamera-devel","RFC","06/17"]}