[libcamera-devel,v4,01/22] v4l2: v4l2_camera_file: Add V4L2CameraFile to model the opened camera file
diff mbox series

Message ID 20200624145256.48266-2-paul.elder@ideasonboard.com
State Accepted
Headers show
Series
  • Support v4l2-compliance
Related show

Commit Message

Paul Elder June 24, 2020, 2:52 p.m. UTC 
With relation to opening files, the kernel has three objects related to
files:
- inodes, that represent files on disk
- file objects, that are allocated at open() time and store all data
  related to the open file
- file descriptors, that are integers that map to a file

In the V4L2 compatibility layer, V4L2CameraProxy, which wraps a single
libcamera camera via V4L2Camera, is more or less equivalent to the
inode. We also already have file descriptors (that are really eventfds)
that mirror the file descriptors. Here we create a V4L2CameraFile to
model the file objects, to contain information related to the open file,
namely if the file has been opened as non-blocking, and the V4L2
priority (to support VIDIOC_G/S_PRIORITY later on). This new class
allows us to more cleanly support multiple open later on, since we can
move out of V4L2CameraProxy the handling of mapping the fd to the open
file information.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

---
No change in v4

Changes in v3:
- cosmetic changes
- change public V4L2CameraFile::priority_ to private with public getter
  and setter

New in v2
---
 src/v4l2/meson.build          |  1 +
 src/v4l2/v4l2_camera_file.cpp | 26 ++++++++++++++++++++++++
 src/v4l2/v4l2_camera_file.h   | 37 +++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/v4l2/v4l2_camera_file.cpp
 create mode 100644 src/v4l2/v4l2_camera_file.h

Patch
diff mbox series 

diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build
index f2e4aaf..e3838f0 100644
--- a/src/v4l2/meson.build
+++ b/src/v4l2/meson.build
@@ -2,6 +2,7 @@ 
 
 v4l2_compat_sources = files([
     'v4l2_camera.cpp',
+    'v4l2_camera_file.cpp',
     'v4l2_camera_proxy.cpp',
     'v4l2_compat.cpp',
     'v4l2_compat_manager.cpp',
diff --git a/src/v4l2/v4l2_camera_file.cpp b/src/v4l2/v4l2_camera_file.cpp
new file mode 100644
index 0000000..d3232ab
--- /dev/null
+++ b/src/v4l2/v4l2_camera_file.cpp
@@ -0,0 +1,26 @@ 
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2020, Google Inc.
+ *
+ * v4l2_camera_file.h - V4L2 compatibility camera file information
+ */
+
+#include "v4l2_camera_file.h"
+
+#include <linux/videodev2.h>
+
+#include "v4l2_camera_proxy.h"
+
+using namespace libcamera;
+
+V4L2CameraFile::V4L2CameraFile(int efd, bool nonBlocking, V4L2CameraProxy *proxy)
+	: proxy_(proxy), nonBlocking_(nonBlocking), efd_(efd),
+	  priority_(V4L2_PRIORITY_DEFAULT)
+{
+	proxy_->open(nonBlocking);
+}
+
+V4L2CameraFile::~V4L2CameraFile()
+{
+	proxy_->close();
+}
diff --git a/src/v4l2/v4l2_camera_file.h b/src/v4l2/v4l2_camera_file.h
new file mode 100644
index 0000000..8f4670a
--- /dev/null
+++ b/src/v4l2/v4l2_camera_file.h
@@ -0,0 +1,37 @@ 
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2020, Google Inc.
+ *
+ * v4l2_camera_file.h - V4L2 compatibility camera file information
+ */
+
+#ifndef __V4L2_CAMERA_FILE_H__
+#define __V4L2_CAMERA_FILE_H__
+
+#include <linux/videodev2.h>
+
+class V4L2CameraProxy;
+
+class V4L2CameraFile
+{
+public:
+	V4L2CameraFile(int efd, bool nonBlocking, V4L2CameraProxy *proxy);
+	~V4L2CameraFile();
+
+	V4L2CameraProxy *proxy() const { return proxy_; }
+
+	bool nonBlocking() const { return nonBlocking_; }
+	int efd() const { return efd_; }
+
+	enum v4l2_priority priority() const { return priority_; }
+	void setPriority(enum v4l2_priority priority) { priority_ = priority; }
+
+private:
+	V4L2CameraProxy *proxy_;
+
+	bool nonBlocking_;
+	int efd_;
+	enum v4l2_priority priority_;
+};
+
+#endif /* __V4L2_CAMERA_FILE_H__ */