PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: camera_manager: Bind CameraManager to threads

Browse Source 
The CameraManager class uses the event dispatcher of the current thread.
This makes the CameraManager::eventDispatcher() and
CameraManager::setEventDispatcher() methods inconsistent, as they access
different event dispatcher instances depending on the calling thread.

Fix this by inheriting from the Object class, which binds the
CameraManager to a thread, and use the event dispatcher of the bound
thread.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2019-08-11 15:46:59 +03:00
parent 980d1ee0c0
commit b566e97aac
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libcamera/camera_manager.h
View File

@@ -11,6 +11,8 @@
#include <string>
#include <vector>
#include <libcamera/object.h>
namespace libcamera {
class Camera;
@@ -18,7 +20,7 @@ class DeviceEnumerator;
class EventDispatcher;
class PipelineHandler;
class CameraManager
class CameraManager : public Object
{
public:
int start();

4
src/libcamera/camera_manager.cpp
View File

@@ -248,7 +248,7 @@ CameraManager *CameraManager::instance()
*/
void CameraManager::setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher)
{
Thread::current()->setEventDispatcher(std::move(dispatcher));
thread()->setEventDispatcher(std::move(dispatcher));
}
/**
@@ -264,7 +264,7 @@ void CameraManager::setEventDispatcher(std::unique_ptr<EventDispatcher> dispatch
*/
EventDispatcher *CameraManager::eventDispatcher()
{
return Thread::current()->eventDispatcher();
return thread()->eventDispatcher();
}
} /* namespace libcamera */