From 8e716be52900389215344577112e88df0d8616df Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/cam/main.cpp | 63 +++++++-------------------------------------------------
 1 file changed, 8 insertions(+), 55 deletions(-)

(limited to 'src/cam/main.cpp')

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<Camera> 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> camera_;
-	std::unique_ptr<libcamera::CameraConfiguration> config_;
 	std::unique_ptr<CameraSession> 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<CameraSession>(camera_, options_);
+		if (!session_->isValid()) {
+			std::cout << "Failed to create camera session" << std::endl;
 			cleanup();
-			return ret;
+			return -EINVAL;
 		}
 
-		session_ = std::make_unique<CameraSession>(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