mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-17 01:15:06 +03:00
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. As a consequence of this change, the IPU3 pipeline handler will fail to operate properly when the cameras it exposes are operated concurrently. The android.hardware.camera2.cts.MultiViewTest#testDualCameraPreview test fails as a result. This should be fixed in the IPU3 pipeline handler to implement mutual exclusion between cameras. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Tested-by: David Plowman <david.plowman@raspberrypi.com>
This commit is contained in:
parent
434edb7b44
commit
dfc6d711c9
4 changed files with 55 additions and 29 deletions
|
@ -45,8 +45,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;
|
||||
|
@ -77,6 +77,8 @@ protected:
|
|||
CameraManager *manager_;
|
||||
|
||||
private:
|
||||
void unlockMediaDevices();
|
||||
|
||||
void mediaDeviceDisconnected(MediaDevice *media);
|
||||
virtual void disconnect();
|
||||
|
||||
|
@ -91,7 +93,7 @@ private:
|
|||
const char *name_;
|
||||
|
||||
Mutex lock_;
|
||||
bool lockOwner_ LIBCAMERA_TSA_GUARDED_BY(lock_); /* *Not* ownership of lock_ */
|
||||
unsigned int useCount_ LIBCAMERA_TSA_GUARDED_BY(lock_);
|
||||
|
||||
friend class PipelineHandlerFactory;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue