NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

gstreamer: Fix concurrent access issues to CameraManager

Browse source 
It's not allowed to have multiple instances of CameraManager. This
requirement is not easy for GStreamer were the device monitor and
the camerasrc, or two camerasrc instances don't usually have any
interaction between each other. Fix this by implementing a minimalist
singleton around CameraManager constructor and start()/stop()
operations.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Nicolas Dufresne 2021-08-26 09:23:45 -04:00 • committed by Laurent Pinchart
parent 1ca5513396
commit 9c49106b97
4 changed files with 35 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gstreamer/gstlibcamerasrc.cpp
View file

@ -108,7 +108,7 @@ GstBuffer *RequestWrap::detachBuffer(Stream *stream)
struct GstLibcameraSrcState {
GstLibcameraSrc *src_;
std::unique_ptr<CameraManager> cm_;
std::shared_ptr<CameraManager> cm_;
std::shared_ptr<Camera> cam_;
std::unique_ptr<CameraConfiguration> config_;
std::vector<GstPad *> srcpads_;
@ -202,13 +202,13 @@ GstLibcameraSrcState::requestCompleted(Request *request)
static bool
gst_libcamera_src_open(GstLibcameraSrc *self)
{
std::unique_ptr<CameraManager> cm = std::make_unique<CameraManager>();
std::shared_ptr<CameraManager> cm;
std::shared_ptr<Camera> cam;
gint ret = 0;
gint ret;
GST_DEBUG_OBJECT(self, "Opening camera device ...");
ret = cm->start();
cm = gst_libcamera_get_camera_mananger(ret);
if (ret) {
GST_ELEMENT_ERROR(self, LIBRARY, INIT,
("Failed listing cameras."),
@ -254,7 +254,7 @@ gst_libcamera_src_open(GstLibcameraSrc *self)
cam->requestCompleted.connect(self->state, &GstLibcameraSrcState::requestCompleted);
/* No need to lock here, we didn't start our threads yet. */
self->state->cm_ = std::move(cm);
self->state->cm_ = cm;
self->state->cam_ = cam;
return true;
@ -521,7 +521,6 @@ gst_libcamera_src_close(GstLibcameraSrc *self)
}
state->cam_.reset();
state->cm_->stop();
state->cm_.reset();
}