[{"id":18130,"web_url":"https://patchwork.libcamera.org/comment/18130/","msgid":"","date":"2021-07-12T15:37:43","subject":"Re: [libcamera-devel] [PATCH 18/30] cam: Move CameraConfiguration\n\tcreation to CameraSession class","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 07/07/2021 03:19, Laurent Pinchart wrote:\n> Creating a configuration for a camera is an operation that logically\n> belongs to the CameraSession class. Move it there.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\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(-)\n> \n> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\n> index 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;\n> diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\n> index 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_;\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 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>","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 A67C6C3225\n\tfor ;\n\tMon, 12 Jul 2021 15:37:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F2F7868524;\n\tMon, 12 Jul 2021 17:37:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CC60068513\n\tfor ;\n\tMon, 12 Jul 2021 17:37:46 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 694E6CC;\n\tMon, 12 Jul 2021 17:37:46 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"dBS+daDL\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626104266;\n\tbh=ITbiQA+Juybv9Oc08qZNkfdYEA9IoacVaq63WCTWnG8=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=dBS+daDLSM+yL+x6sf7OMaBz2vQ1ZarRjChP3o0CzSg1RH6EjAb0E1PHR5i0i9rlS\n\tIugn5uy4TE9Ly0tOjgMcHQk3Alsd6xftQgBaI+skft00YBV7QMs3daQJAN3ynqzRhC\n\ttpdXptcWg2oA7x3EX32WXv/QLQ5r817+hDaZmK0E=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>\n\t<20210707021941.20804-19-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"","Date":"Mon, 12 Jul 2021 16:37:43 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210707021941.20804-19-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 18/30] 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\" "}}]