From 8e716be52900389215344577112e88df0d8616df Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 5 Jul 2021 19:05:23 +0300 Subject: cam: Move CameraConfiguration creation to CameraSession class Creating a configuration for a camera is an operation that logically belongs to the CameraSession class. Move it there. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.cpp | 47 +++++++++++++++++++++++++++++++--- src/cam/camera_session.h | 7 ++++-- src/cam/main.cpp | 63 ++++++---------------------------------------- 3 files changed, 56 insertions(+), 61 deletions(-) (limited to 'src') diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index 7bb75e86..edc7205d 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -15,14 +15,53 @@ #include "camera_session.h" #include "event_loop.h" #include "main.h" +#include "stream_options.h" using namespace libcamera; CameraSession::CameraSession(std::shared_ptr camera, - CameraConfiguration *config) - : camera_(camera), config_(config), last_(0), queueCount_(0), - captureCount_(0), captureLimit_(0), printMetadata_(false) + const OptionsParser::Options &options) + : camera_(camera), last_(0), queueCount_(0), captureCount_(0), + captureLimit_(0), printMetadata_(false) { + StreamRoles roles = StreamKeyValueParser::roles(options[OptStream]); + + std::unique_ptr config = + camera_->generateConfiguration(roles); + if (!config || config->size() != roles.size()) { + std::cerr << "Failed to get default stream configuration" + << std::endl; + return; + } + + /* Apply configuration if explicitly requested. */ + if (StreamKeyValueParser::updateConfiguration(config.get(), + options[OptStream])) { + std::cerr << "Failed to update configuration" << std::endl; + return; + } + + bool strictFormats = options.isSet(OptStrictFormats); + + switch (config->validate()) { + case CameraConfiguration::Valid: + break; + + case CameraConfiguration::Adjusted: + if (strictFormats) { + std::cout << "Adjusting camera configuration disallowed by --strict-formats argument" + << std::endl; + return; + } + std::cout << "Camera configuration adjusted" << std::endl; + break; + + case CameraConfiguration::Invalid: + std::cout << "Camera configuration invalid" << std::endl; + return; + } + + config_ = std::move(config); } int CameraSession::start(const OptionsParser::Options &options) @@ -34,7 +73,7 @@ int CameraSession::start(const OptionsParser::Options &options) captureLimit_ = options[OptCapture].toInteger(); printMetadata_ = options.isSet(OptMetadata); - ret = camera_->configure(config_); + ret = camera_->configure(config_.get()); if (ret < 0) { std::cout << "Failed to configure camera" << std::endl; return ret; diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h index 31e8d6db..39dbbdf3 100644 --- a/src/cam/camera_session.h +++ b/src/cam/camera_session.h @@ -26,7 +26,10 @@ class CameraSession { public: CameraSession(std::shared_ptr camera, - libcamera::CameraConfiguration *config); + const OptionsParser::Options &options); + + bool isValid() const { return config_ != nullptr; } + libcamera::CameraConfiguration *config() { return config_.get(); } int start(const OptionsParser::Options &options); void stop(); @@ -41,7 +44,7 @@ private: void processRequest(libcamera::Request *request); std::shared_ptr camera_; - libcamera::CameraConfiguration *config_; + std::unique_ptr config_; std::map streamName_; std::unique_ptr writer_; diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 2c6500a5..082a053e 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -40,7 +40,6 @@ private: void cameraRemoved(std::shared_ptr cam); void captureDone(); int parseOptions(int argc, char *argv[]); - int prepareConfig(); int listControls(); int listProperties(); int infoConfiguration(); @@ -53,19 +52,15 @@ private: CameraManager *cm_; std::shared_ptr camera_; - std::unique_ptr config_; std::unique_ptr session_; EventLoop loop_; - - bool strictFormats_; }; CamApp *CamApp::app_ = nullptr; CamApp::CamApp() - : cm_(nullptr), camera_(nullptr), config_(nullptr), - strictFormats_(false) + : cm_(nullptr), camera_(nullptr) { CamApp::app_ = this; } @@ -88,9 +83,6 @@ int CamApp::init(int argc, char **argv) if (ret < 0) return ret; - if (options_.isSet(OptStrictFormats)) - strictFormats_ = true; - cm_ = new CameraManager(); ret = cm_->start(); @@ -125,13 +117,13 @@ int CamApp::init(int argc, char **argv) std::cout << "Using camera " << camera_->id() << std::endl; - ret = prepareConfig(); - if (ret) { + session_ = std::make_unique(camera_, options_); + if (!session_->isValid()) { + std::cout << "Failed to create camera session" << std::endl; cleanup(); - return ret; + return -EINVAL; } - session_ = std::make_unique(camera_, config_.get()); session_->captureDone.connect(this, &CamApp::captureDone); } @@ -151,7 +143,7 @@ void CamApp::cleanup() camera_.reset(); } - config_.reset(); + session_.reset(); cm_->stop(); } @@ -220,45 +212,6 @@ int CamApp::parseOptions(int argc, char *argv[]) return 0; } -int CamApp::prepareConfig() -{ - StreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]); - - config_ = camera_->generateConfiguration(roles); - if (!config_ || config_->size() != roles.size()) { - std::cerr << "Failed to get default stream configuration" - << std::endl; - return -EINVAL; - } - - /* Apply configuration if explicitly requested. */ - if (StreamKeyValueParser::updateConfiguration(config_.get(), - options_[OptStream])) { - std::cerr << "Failed to update configuration" << std::endl; - return -EINVAL; - } - - switch (config_->validate()) { - case CameraConfiguration::Valid: - break; - case CameraConfiguration::Adjusted: - if (strictFormats_) { - std::cout << "Adjusting camera configuration disallowed by --strict-formats argument" - << std::endl; - config_.reset(); - return -EINVAL; - } - std::cout << "Camera configuration adjusted" << std::endl; - break; - case CameraConfiguration::Invalid: - std::cout << "Camera configuration invalid" << std::endl; - config_.reset(); - return -EINVAL; - } - - return 0; -} - int CamApp::listControls() { if (!camera_) { @@ -299,14 +252,14 @@ int CamApp::listProperties() int CamApp::infoConfiguration() { - if (!config_) { + if (!camera_) { std::cout << "Cannot print stream information without a camera" << std::endl; return -EINVAL; } unsigned int index = 0; - for (const StreamConfiguration &cfg : *config_) { + for (const StreamConfiguration &cfg : *session_->config()) { std::cout << index << ": " << cfg.toString() << std::endl; const StreamFormats &formats = cfg.formats(); -- cgit v1.2.1