libcamera: Allow concurrent use of cameras from same pipeline handler

libcamera implements a pipeline handler locking mechanism based on
advisory locks on media devices, to prevent concurrent access to cameras
from the same pipeline handler from different processes (this only works
between multiple libcamera instances, as other processes won't use
advisory locks on media devices).

A side effect of the implementation prevents multiple cameras created by
the same pipeline handler from being used concurrently. Fix this by
turning the PipelineHandler lock() and unlock() functions into acquire()
and release(), with a use count to replace the boolean lock flag. The
Camera class is updated accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
index b473eb70..17e5c892 100644
--- a/include/libcamera/internal/pipeline_handler.h
+++ b/include/libcamera/internal/pipeline_handler.h
@@ -44,8 +44,8 @@ public:
 	MediaDevice *acquireMediaDevice(DeviceEnumerator *enumerator,
 					const DeviceMatch &dm);
 
-	bool lock();
-	void unlock();
+	bool acquire();
+	void release();
 
 	virtual CameraConfiguration *generateConfiguration(Camera *camera,
 		const StreamRoles &roles) = 0;
@@ -74,7 +74,7 @@ protected:
 	CameraManager *manager_;
 
 private:
-	void unlockLocked();
+	void unlockMediaDevices();
 
 	void mediaDeviceDisconnected(MediaDevice *media);
 	virtual void disconnect();
@@ -85,7 +85,7 @@ private:
 	const char *name_;
 
 	Mutex lock_;
-	bool lockOwner_;
+	unsigned int useCount_;
 
 	friend class PipelineHandlerFactory;
 };