[{"id":37622,"web_url":"https://patchwork.libcamera.org/comment/37622/","msgid":"<7e709bf9-6b95-4069-ab3c-73b374b52a75@ideasonboard.com>","date":"2026-01-13T16:45:31","subject":"Re: [PATCH 24/36] libcamera: global_configuration: Rename\n\tConfiguration to Option","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"2026. 01. 13. 1:07 keltezéssel, Laurent Pinchart írta:\n> The GlobalConfiguration::Configuration type represent a configuration\n> option. Rename it to Option to make this clearer. This shortens lines as\n> an added bonus.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n\nTo be honest I would remove the type alias altogether because I'm not\nsure it adds sufficient value.\n\nReviewed-by: Barnabás Pőcze \n\n\n> include/libcamera/internal/global_configuration.h | 4 ++--\n> src/libcamera/global_configuration.cpp | 8 ++++----\n> src/libcamera/pipeline/simple/simple.cpp | 2 +-\n> 3 files changed, 7 insertions(+), 7 deletions(-)\n> \n> diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\n> index 5c907ee92bfe..2c0bfadb4676 100644\n> --- a/include/libcamera/internal/global_configuration.h\n> +++ b/include/libcamera/internal/global_configuration.h\n> @@ -22,12 +22,12 @@ namespace libcamera {\n> class GlobalConfiguration\n> {\n> public:\n> -\tusing Configuration = const ValueNode &;\n> +\tusing Option = const ValueNode &;\n> \n> \tGlobalConfiguration();\n> \n> \tunsigned int version() const;\n> -\tConfiguration configuration() const;\n> +\tOption configuration() const;\n> \n> \ttemplate\n> \tstd::optional option(\n> diff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\n> index ee7d9c185b80..4d154c026e44 100644\n> --- a/src/libcamera/global_configuration.cpp\n> +++ b/src/libcamera/global_configuration.cpp\n> @@ -56,8 +56,8 @@ LOG_DEFINE_CATEGORY(Configuration)\n> */\n> \n> /**\n> - * \\typedef GlobalConfiguration::Configuration\n> - * \\brief Type representing global libcamera configuration\n> + * \\typedef GlobalConfiguration::Option\n> + * \\brief Type representing a configuration option\n> *\n> * All code outside GlobalConfiguration must use this type declaration and not\n> * the underlying type.\n> @@ -156,9 +156,9 @@ unsigned int GlobalConfiguration::version() const\n> * \\note \\a ValueNode type itself shouldn't be used in type declarations to\n> * avoid trouble if we decide to change the underlying data objects in future.\n> *\n> - * \\return The whole configuration section\n> + * \\return The top-level configuration option\n> */\n> -GlobalConfiguration::Configuration GlobalConfiguration::configuration() const\n> +GlobalConfiguration::Option GlobalConfiguration::configuration() const\n> {\n> \treturn (*configuration_)[\"configuration\"];\n> }\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index b30b0a122e6e..bdc87d39ef0b 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -1880,7 +1880,7 @@ bool SimplePipelineHandler::matchDevice(std::shared_ptr media,\n> \n> \tswIspEnabled_ = info.swIspEnabled;\n> \tconst GlobalConfiguration &configuration = cameraManager()->_d()->configuration();\n> -\tfor (GlobalConfiguration::Configuration entry :\n> +\tfor (GlobalConfiguration::Option entry :\n> \t configuration.configuration()[\"pipelines\"][\"simple\"][\"supported_devices\"]\n> \t\t .asList()) {\n> \t\tauto name = entry[\"driver\"].get();","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 EA137BE08B\n\tfor ;\n\tTue, 13 Jan 2026 16:45:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1989461FBC;\n\tTue, 13 Jan 2026 17:45:36 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 34D5761FA0\n\tfor ;\n\tTue, 13 Jan 2026 17:45:35 +0100 (CET)","from [192.168.33.30] (185.221.143.114.nat.pool.zt.hu\n\t[185.221.143.114])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E46FC50A;\n\tTue, 13 Jan 2026 17:45:08 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"YY6b9qY4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1768322709;\n\tbh=TS8vXvlRs1FvDNZ6ZNifTOHzeyXZQMUOZeq9GgtUDT0=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=YY6b9qY4k3+/iPOtIbqlcNvWHxWEewPDvzlJysXNBwlFvP5f84QFLVvB0NOyTuLxm\n\tl4zu6l3YUOuen0J5S4Vd73w8ErApI4fp9Xj5t7AjMbYo/rZVUKzy1jgmdAVwrPVdrW\n\tx4U7Ucn6lKNgmneU8a+cOonFPMlQAgML3Ft7I5VA=","Message-ID":"<7e709bf9-6b95-4069-ab3c-73b374b52a75@ideasonboard.com>","Date":"Tue, 13 Jan 2026 17:45:31 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 24/36] libcamera: global_configuration: Rename\n\tConfiguration to Option","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>\n\t<20260113000808.15395-25-laurent.pinchart@ideasonboard.com>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Content-Language":"en-US, hu-HU","In-Reply-To":"<20260113000808.15395-25-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"8bit","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\" "}},{"id":37625,"web_url":"https://patchwork.libcamera.org/comment/37625/","msgid":"<20260113203101.GC30544@pendragon.ideasonboard.com>","date":"2026-01-13T20:31:01","subject":"Re: [PATCH 24/36] libcamera: global_configuration: Rename\n\tConfiguration to Option","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, Jan 13, 2026 at 05:45:31PM +0100, Barnabás Pőcze wrote:\n> 2026. 01. 13. 1:07 keltezéssel, Laurent Pinchart írta:\n> > The GlobalConfiguration::Configuration type represent a configuration\n> > option. Rename it to Option to make this clearer. This shortens lines as\n> > an added bonus.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> \n> To be honest I would remove the type alias altogether because I'm not\n> sure it adds sufficient value.\n\nIt was added to avoid depending directly on YamlObject, even if I wasn't\nentirely convinced during review that it was a good idea. I would be\nfine using ValueNode directly as it's now becoming a generic class\ninside libcamera, not something tied to YAML parsing any more. I think\nI'll keep this patch in v2, and maybe add a patch on top to remove the\nalias. We can then decide if we want to merge it.\n\n> Reviewed-by: Barnabás Pőcze \n> \n> > include/libcamera/internal/global_configuration.h | 4 ++--\n> > src/libcamera/global_configuration.cpp | 8 ++++----\n> > src/libcamera/pipeline/simple/simple.cpp | 2 +-\n> > 3 files changed, 7 insertions(+), 7 deletions(-)\n> > \n> > diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\n> > index 5c907ee92bfe..2c0bfadb4676 100644\n> > --- a/include/libcamera/internal/global_configuration.h\n> > +++ b/include/libcamera/internal/global_configuration.h\n> > @@ -22,12 +22,12 @@ namespace libcamera {\n> > class GlobalConfiguration\n> > {\n> > public:\n> > -\tusing Configuration = const ValueNode &;\n> > +\tusing Option = const ValueNode &;\n> > \n> > \tGlobalConfiguration();\n> > \n> > \tunsigned int version() const;\n> > -\tConfiguration configuration() const;\n> > +\tOption configuration() const;\n> > \n> > \ttemplate\n> > \tstd::optional option(\n> > diff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\n> > index ee7d9c185b80..4d154c026e44 100644\n> > --- a/src/libcamera/global_configuration.cpp\n> > +++ b/src/libcamera/global_configuration.cpp\n> > @@ -56,8 +56,8 @@ LOG_DEFINE_CATEGORY(Configuration)\n> > */\n> > \n> > /**\n> > - * \\typedef GlobalConfiguration::Configuration\n> > - * \\brief Type representing global libcamera configuration\n> > + * \\typedef GlobalConfiguration::Option\n> > + * \\brief Type representing a configuration option\n> > *\n> > * All code outside GlobalConfiguration must use this type declaration and not\n> > * the underlying type.\n> > @@ -156,9 +156,9 @@ unsigned int GlobalConfiguration::version() const\n> > * \\note \\a ValueNode type itself shouldn't be used in type declarations to\n> > * avoid trouble if we decide to change the underlying data objects in future.\n> > *\n> > - * \\return The whole configuration section\n> > + * \\return The top-level configuration option\n> > */\n> > -GlobalConfiguration::Configuration GlobalConfiguration::configuration() const\n> > +GlobalConfiguration::Option GlobalConfiguration::configuration() const\n> > {\n> > \treturn (*configuration_)[\"configuration\"];\n> > }\n> > diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> > index b30b0a122e6e..bdc87d39ef0b 100644\n> > --- a/src/libcamera/pipeline/simple/simple.cpp\n> > +++ b/src/libcamera/pipeline/simple/simple.cpp\n> > @@ -1880,7 +1880,7 @@ bool SimplePipelineHandler::matchDevice(std::shared_ptr media,\n> > \n> > \tswIspEnabled_ = info.swIspEnabled;\n> > \tconst GlobalConfiguration &configuration = cameraManager()->_d()->configuration();\n> > -\tfor (GlobalConfiguration::Configuration entry :\n> > +\tfor (GlobalConfiguration::Option entry :\n> > \t configuration.configuration()[\"pipelines\"][\"simple\"][\"supported_devices\"]\n> > \t\t .asList()) {\n> > \t\tauto name = entry[\"driver\"].get();","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 40E65BE08B\n\tfor ;\n\tTue, 13 Jan 2026 20:31:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7C04D61FA0;\n\tTue, 13 Jan 2026 21:31:24 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CABAE61FA0\n\tfor ;\n\tTue, 13 Jan 2026 21:31:22 +0100 (CET)","from pendragon.ideasonboard.com (81-175-209-152.bb.dnainternet.fi\n\t[81.175.209.152])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 50E99229;\n\tTue, 13 Jan 2026 21:30:56 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CM+8vgoq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1768336256;\n\tbh=AWKGR9B33VNCwzvi+OB490veBvVuqZY/B1uALEFiYJg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=CM+8vgoq+luHGvE/F0n5Q9yKXcooPp6PO5lsDj1ITuI5XjETBJa8QAc4EIBr6hJRs\n\twmHpigVw4QDqmDTDwDWjuwA484DXhHVhgFabrSkz58IlbboLuoqnPsjkPyZ5ngil8s\n\tIawN8q/02hbLh/oIXhz7ElT4dzZzgLStD8EfFA7U=","Date":"Tue, 13 Jan 2026 22:31:01 +0200","From":"Laurent Pinchart ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH 24/36] libcamera: global_configuration: Rename\n\tConfiguration to Option","Message-ID":"<20260113203101.GC30544@pendragon.ideasonboard.com>","References":"<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>\n\t<20260113000808.15395-25-laurent.pinchart@ideasonboard.com>\n\t<7e709bf9-6b95-4069-ab3c-73b374b52a75@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<7e709bf9-6b95-4069-ab3c-73b374b52a75@ideasonboard.com>","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\" "}}]