From 8519df23a9b8fbc4d845787bc4ad443792736347 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 6 Jul 2021 07:33:10 +0300 Subject: cam: Move camera acquire to the CameraSession class Continue moving towards making the CameraSession class the central point to handle a camera by moving the camera acquire operation. A new CameraSession::camera() function is needed to allow access to the camera from CamApp. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.cpp | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'src/cam/camera_session.cpp') diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index edc7205d..10e66446 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -19,11 +19,30 @@ using namespace libcamera; -CameraSession::CameraSession(std::shared_ptr camera, +CameraSession::CameraSession(CameraManager *cm, const OptionsParser::Options &options) - : camera_(camera), last_(0), queueCount_(0), captureCount_(0), + : last_(0), queueCount_(0), captureCount_(0), captureLimit_(0), printMetadata_(false) { + const std::string &cameraId = options[OptCamera]; + char *endptr; + unsigned long index = strtoul(cameraId.c_str(), &endptr, 10); + if (*endptr == '\0' && index > 0 && index <= cm->cameras().size()) + camera_ = cm->cameras()[index - 1]; + else + camera_ = cm->get(cameraId); + + if (!camera_) { + std::cerr << "Camera " << cameraId << " not found" << std::endl; + return; + } + + if (camera_->acquire()) { + std::cerr << "Failed to acquire camera " << cameraId + << std::endl; + return; + } + StreamRoles roles = StreamKeyValueParser::roles(options[OptStream]); std::unique_ptr config = @@ -64,6 +83,12 @@ CameraSession::CameraSession(std::shared_ptr camera, config_ = std::move(config); } +CameraSession::~CameraSession() +{ + if (camera_) + camera_->release(); +} + int CameraSession::start(const OptionsParser::Options &options) { int ret; -- cgit v1.2.1