Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-24 09:05:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

cam: camera_session: Access event loop through global instance

Browse source 
Don't pass the event loop to the CameraSession constructor, as passing
this global object explicitly isn't a design that can scale.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-07-05 06:59:21 +03:00
parent 94d828d880
commit 453583e189
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cam/camera_session.cpp
View file

@ -13,13 +13,14 @@
#include <libcamera/control_ids.h>
#include "camera_session.h"
#include "event_loop.h"
#include "main.h"
using namespace libcamera;
CameraSession::CameraSession(std::shared_ptr<Camera> camera,
CameraConfiguration *config, EventLoop *loop)
: camera_(camera), config_(config), writer_(nullptr), last_(0), loop_(loop),
CameraConfiguration *config)
: camera_(camera), config_(config), writer_(nullptr), last_(0),
queueCount_(0), captureCount_(0), captureLimit_(0),
printMetadata_(false)
{
@ -145,7 +146,7 @@ int CameraSession::capture(FrameBufferAllocator *allocator)
else
std::cout << "Capture until user interrupts by SIGINT" << std::endl;
ret = loop_->exec();
ret = EventLoop::instance()->exec();
if (ret)
std::cout << "Failed to run capture loop" << std::endl;
@ -175,7 +176,7 @@ void CameraSession::requestComplete(Request *request)
* Defer processing of the completed request to the event loop, to avoid
* blocking the camera manager thread.
*/
loop_->callLater([=]() { processRequest(request); });
EventLoop::instance()->callLater([=]() { processRequest(request); });
}
void CameraSession::processRequest(Request *request)
@ -231,7 +232,7 @@ void CameraSession::processRequest(Request *request)
captureCount_++;
if (captureLimit_ && captureCount_ >= captureLimit_) {
loop_->exit(0);
EventLoop::instance()->exit(0);
return;
}