{"id":12992,"url":"https://patchwork.libcamera.org/api/1.1/patches/12992/?format=json","web_url":"https://patchwork.libcamera.org/patch/12992/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210715211459.19373-22-laurent.pinchart@ideasonboard.com>","date":"2021-07-15T21:14:47","name":"[libcamera-devel,v3,21/33] cam: Move CameraConfiguration creation to CameraSession class","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7f3dbefc24df6e2e8442239bf85150a94283884b","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12992/mbox/","series":[{"id":2242,"url":"https://patchwork.libcamera.org/api/1.1/series/2242/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2242","date":"2021-07-15T21:14:26","name":"Multi-camera support in the cam application","version":3,"mbox":"https://patchwork.libcamera.org/series/2242/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12992/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12992/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E1DC6C3228\n\tfor ;\n\tThu, 15 Jul 2021 21:15:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 710A468568;\n\tThu, 15 Jul 2021 23:15:25 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BE19B6855B\n\tfor ;\n\tThu, 15 Jul 2021 23:15:11 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5B09BA24\n\tfor ;\n\tThu, 15 Jul 2021 23:15:11 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"URKIC6Ei\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626383711;\n\tbh=yrB8a3M+wiQrBwYkAjzfInUoypqmiUs8amk92KN6h1w=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=URKIC6EiQhVbQxlOiHD07jAGcm6sRAdfsixxkC4eUuPgtT455mkYj6BF075XZIohS\n\tyrGKHZyCQXjhItenHSvEbwvbXw+jYWlJwy8j24kc1TKdG4guaABm9vuFOq5YfqpUDm\n\tr+Q6mkx8VxHFGiNHMT62NidHdpNDFDut9u+AgkSg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 16 Jul 2021 00:14:47 +0300","Message-Id":"<20210715211459.19373-22-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210715211459.19373-1-laurent.pinchart@ideasonboard.com>","References":"<20210715211459.19373-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 21/33] cam: Move CameraConfiguration\n\tcreation to CameraSession class","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Creating a configuration for a camera is an operation that logically\nbelongs to the CameraSession class. Move it there.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/cam/camera_session.cpp | 47 +++++++++++++++++++++++++---\n src/cam/camera_session.h | 7 +++--\n src/cam/main.cpp | 63 +++++---------------------------------\n 3 files changed, 56 insertions(+), 61 deletions(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 7bb75e86eab5..edc7205d6bda 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -15,14 +15,53 @@\n #include \"camera_session.h\"\n #include \"event_loop.h\"\n #include \"main.h\"\n+#include \"stream_options.h\"\n \n using namespace libcamera;\n \n CameraSession::CameraSession(std::shared_ptr camera,\n-\t\t\t CameraConfiguration *config)\n-\t: camera_(camera), config_(config), last_(0), queueCount_(0),\n-\t captureCount_(0), captureLimit_(0), printMetadata_(false)\n+\t\t\t const OptionsParser::Options &options)\n+\t: camera_(camera), last_(0), queueCount_(0), captureCount_(0),\n+\t captureLimit_(0), printMetadata_(false)\n {\n+\tStreamRoles roles = StreamKeyValueParser::roles(options[OptStream]);\n+\n+\tstd::unique_ptr config =\n+\t\tcamera_->generateConfiguration(roles);\n+\tif (!config || config->size() != roles.size()) {\n+\t\tstd::cerr << \"Failed to get default stream configuration\"\n+\t\t\t << std::endl;\n+\t\treturn;\n+\t}\n+\n+\t/* Apply configuration if explicitly requested. */\n+\tif (StreamKeyValueParser::updateConfiguration(config.get(),\n+\t\t\t\t\t\t options[OptStream])) {\n+\t\tstd::cerr << \"Failed to update configuration\" << std::endl;\n+\t\treturn;\n+\t}\n+\n+\tbool strictFormats = options.isSet(OptStrictFormats);\n+\n+\tswitch (config->validate()) {\n+\tcase CameraConfiguration::Valid:\n+\t\tbreak;\n+\n+\tcase CameraConfiguration::Adjusted:\n+\t\tif (strictFormats) {\n+\t\t\tstd::cout << \"Adjusting camera configuration disallowed by --strict-formats argument\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn;\n+\t\t}\n+\t\tstd::cout << \"Camera configuration adjusted\" << std::endl;\n+\t\tbreak;\n+\n+\tcase CameraConfiguration::Invalid:\n+\t\tstd::cout << \"Camera configuration invalid\" << std::endl;\n+\t\treturn;\n+\t}\n+\n+\tconfig_ = std::move(config);\n }\n \n int CameraSession::start(const OptionsParser::Options &options)\n@@ -34,7 +73,7 @@ int CameraSession::start(const OptionsParser::Options &options)\n \tcaptureLimit_ = options[OptCapture].toInteger();\n \tprintMetadata_ = options.isSet(OptMetadata);\n \n-\tret = camera_->configure(config_);\n+\tret = camera_->configure(config_.get());\n \tif (ret < 0) {\n \t\tstd::cout << \"Failed to configure camera\" << std::endl;\n \t\treturn ret;\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex 31e8d6db01d9..39dbbdf37913 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -26,7 +26,10 @@ class CameraSession\n {\n public:\n \tCameraSession(std::shared_ptr camera,\n-\t\t libcamera::CameraConfiguration *config);\n+\t\t const OptionsParser::Options &options);\n+\n+\tbool isValid() const { return config_ != nullptr; }\n+\tlibcamera::CameraConfiguration *config() { return config_.get(); }\n \n \tint start(const OptionsParser::Options &options);\n \tvoid stop();\n@@ -41,7 +44,7 @@ private:\n \tvoid processRequest(libcamera::Request *request);\n \n \tstd::shared_ptr camera_;\n-\tlibcamera::CameraConfiguration *config_;\n+\tstd::unique_ptr config_;\n \n \tstd::map streamName_;\n \tstd::unique_ptr writer_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 2c6500a5682b..082a053efeda 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -40,7 +40,6 @@ private:\n \tvoid cameraRemoved(std::shared_ptr cam);\n \tvoid captureDone();\n \tint parseOptions(int argc, char *argv[]);\n-\tint prepareConfig();\n \tint listControls();\n \tint listProperties();\n \tint infoConfiguration();\n@@ -53,19 +52,15 @@ private:\n \tCameraManager *cm_;\n \n \tstd::shared_ptr camera_;\n-\tstd::unique_ptr config_;\n \tstd::unique_ptr session_;\n \n \tEventLoop loop_;\n-\n-\tbool strictFormats_;\n };\n \n CamApp *CamApp::app_ = nullptr;\n \n CamApp::CamApp()\n-\t: cm_(nullptr), camera_(nullptr), config_(nullptr),\n-\t strictFormats_(false)\n+\t: cm_(nullptr), camera_(nullptr)\n {\n \tCamApp::app_ = this;\n }\n@@ -88,9 +83,6 @@ int CamApp::init(int argc, char **argv)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tif (options_.isSet(OptStrictFormats))\n-\t\tstrictFormats_ = true;\n-\n \tcm_ = new CameraManager();\n \n \tret = cm_->start();\n@@ -125,13 +117,13 @@ int CamApp::init(int argc, char **argv)\n \n \t\tstd::cout << \"Using camera \" << camera_->id() << std::endl;\n \n-\t\tret = prepareConfig();\n-\t\tif (ret) {\n+\t\tsession_ = std::make_unique(camera_, options_);\n+\t\tif (!session_->isValid()) {\n+\t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n \t\t\tcleanup();\n-\t\t\treturn ret;\n+\t\t\treturn -EINVAL;\n \t\t}\n \n-\t\tsession_ = std::make_unique(camera_, config_.get());\n \t\tsession_->captureDone.connect(this, &CamApp::captureDone);\n \t}\n \n@@ -151,7 +143,7 @@ void CamApp::cleanup()\n \t\tcamera_.reset();\n \t}\n \n-\tconfig_.reset();\n+\tsession_.reset();\n \n \tcm_->stop();\n }\n@@ -220,45 +212,6 @@ int CamApp::parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n-int CamApp::prepareConfig()\n-{\n-\tStreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]);\n-\n-\tconfig_ = camera_->generateConfiguration(roles);\n-\tif (!config_ || config_->size() != roles.size()) {\n-\t\tstd::cerr << \"Failed to get default stream configuration\"\n-\t\t\t << std::endl;\n-\t\treturn -EINVAL;\n-\t}\n-\n-\t/* Apply configuration if explicitly requested. */\n-\tif (StreamKeyValueParser::updateConfiguration(config_.get(),\n-\t\t\t\t\t\t options_[OptStream])) {\n-\t\tstd::cerr << \"Failed to update configuration\" << std::endl;\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tswitch (config_->validate()) {\n-\tcase CameraConfiguration::Valid:\n-\t\tbreak;\n-\tcase CameraConfiguration::Adjusted:\n-\t\tif (strictFormats_) {\n-\t\t\tstd::cout << \"Adjusting camera configuration disallowed by --strict-formats argument\"\n-\t\t\t\t << std::endl;\n-\t\t\tconfig_.reset();\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\t\tstd::cout << \"Camera configuration adjusted\" << std::endl;\n-\t\tbreak;\n-\tcase CameraConfiguration::Invalid:\n-\t\tstd::cout << \"Camera configuration invalid\" << std::endl;\n-\t\tconfig_.reset();\n-\t\treturn -EINVAL;\n-\t}\n-\n-\treturn 0;\n-}\n-\n int CamApp::listControls()\n {\n \tif (!camera_) {\n@@ -299,14 +252,14 @@ int CamApp::listProperties()\n \n int CamApp::infoConfiguration()\n {\n-\tif (!config_) {\n+\tif (!camera_) {\n \t\tstd::cout << \"Cannot print stream information without a camera\"\n \t\t\t << std::endl;\n \t\treturn -EINVAL;\n \t}\n \n \tunsigned int index = 0;\n-\tfor (const StreamConfiguration &cfg : *config_) {\n+\tfor (const StreamConfiguration &cfg : *session_->config()) {\n \t\tstd::cout << index << \": \" << cfg.toString() << std::endl;\n \n \t\tconst StreamFormats &formats = cfg.formats();\n","prefixes":["libcamera-devel","v3","21/33"]}