[{"id":2242,"web_url":"https://patchwork.libcamera.org/comment/2242/","msgid":"<20190713145625.idbcjlxupmdfiqqo@uno.localdomain>","date":"2019-07-13T14:56:25","subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"\"Don't rush when sending patches!\"\n\nOn Sat, Jul 13, 2019 at 04:51:19PM +0200, Jacopo Mondi wrote:\n> Add a '-s|--size' option to qcam to allow selecting the stream\n> resolution using a command line option.\n>\n> If the sizes are not supported by the camera, they get automatically\n> adjusted and the user notified via an output message.\n>\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  src/qcam/main.cpp        |  8 ++++++++\n>  src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++++-\n>  src/qcam/main_window.h   |  1 +\n>  3 files changed, 39 insertions(+), 1 deletion(-)\n>\n> diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> index 106b8a162d9f..da942f3daed6 100644\n> --- a/src/qcam/main.cpp\n> +++ b/src/qcam/main.cpp\n> @@ -25,12 +25,20 @@ void signalHandler(int signal)\n>\n>  OptionsParser::Options parseOptions(int argc, char *argv[])\n>  {\n> +\tKeyValueParser sizeParser;\n> +\tsizeParser.addOption(\"width\", OptionInteger, \"Width in pixels\",\n> +\t\t\t     ArgumentRequired);\n> +\tsizeParser.addOption(\"height\", OptionInteger, \"Height in pixels\",\n> +\t\t\t     ArgumentRequired);\n> +\n>  \tOptionsParser parser;\n>  \tparser.addOption(OptCamera, OptionString,\n>  \t\t\t \"Specify which camera to operate on\", \"camera\",\n>  \t\t\t ArgumentRequired, \"camera\");\n>  \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n>  \t\t\t \"help\");\n> +\tparser.addOption(OptSize, &sizeParser, \"Set the stream size\",\n> +\t\t\t \"size\", true);\n>\n>  \tOptionsParser::Options options = parser.parse(argc, argv);\n>  \tif (options.isSet(OptHelp))\n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 907d2423ed15..d9a30aa15db0 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -116,13 +116,42 @@ int MainWindow::startCapture()\n>  \tint ret;\n>\n>  \tconfig_ = camera_->generateConfiguration({ StreamRole::VideoRecording });\n> +\n> +\tStreamConfiguration &cfg = config_->at(0);\n> +\tif (options_.isSet(OptSize)) {\n> +\t\tconst std::vector<OptionValue> &sizeOptions =\n> +\t\t\toptions_[OptSize].toArray();\n> +\n> +\t\t/* Set desired stream size if requested. */\n> +\t\tfor (auto const &value : sizeOptions) {\n> +\t\t\tKeyValueParser::Options opt = value.toKeyValues();\n> +\n> +\t\t\tif (opt.isSet(\"width\"))\n> +\t\t\t\tcfg.size.width = opt[\"width\"];\n> +\n> +\t\t\tif (opt.isSet(\"height\"))\n> +\t\t\t\tcfg.size.height = opt[\"height\"];\n> +\t\t}\n> +\t}\n> +\n> +\tCameraConfiguration::Status validation = config_->validate();\n> +\tif (validation == CameraConfiguration::Invalid) {\n> +\t\tstd::cerr << \"Faild to apply camera configuration\";\n\nMissing std::endl\n\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\tif (validation == CameraConfiguration::Adjusted) {\n> +\t\tstd::cout << \"Stream sizes adjusted to \"\n> +\t\t\t  << cfg.size.width << \"x\" << cfg.size.height\n> +\t\t\t  << std::endl;\n> +\t}\n\nI could have saved the { } but I actually like the symmetry with the\nabove case.\n\nSorry for the trivial mistakes, just noticed.\n\n> +\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>  \t}\n>\n> -\tconst StreamConfiguration &cfg = config_->at(0);\n>  \tStream *stream = cfg.stream();\n>  \tret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width,\n>  \t\t\t\t     cfg.size.height);\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index f58cb6a65b2b..b45cbca725fa 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -27,6 +27,7 @@ class ViewFinder;\n>  enum {\n>  \tOptCamera = 'c',\n>  \tOptHelp = 'h',\n> +\tOptSize = 's',\n>  };\n>\n>  class MainWindow : public QMainWindow\n> --\n> 2.21.0\n>","headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E0E9A6156A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 13 Jul 2019 16:55:10 +0200 (CEST)","from uno.localdomain (softbank126209254147.bbtec.net\n\t[126.209.254.147]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id BD1941BF209\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 13 Jul 2019 14:55:09 +0000 (UTC)"],"X-Originating-IP":"126.209.254.147","Date":"Sat, 13 Jul 2019 16:56:25 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190713145625.idbcjlxupmdfiqqo@uno.localdomain>","References":"<20190713145119.11193-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"ulunpjmjlqzyzzw7\"","Content-Disposition":"inline","In-Reply-To":"<20190713145119.11193-1-jacopo@jmondi.org>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Sat, 13 Jul 2019 14:55:11 -0000"}},{"id":2247,"web_url":"https://patchwork.libcamera.org/comment/2247/","msgid":"<20190714071930.GB31102@wyvern>","date":"2019-07-14T07:19:30","subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for your work.\n\nOn 2019-07-13 16:51:19 +0200, Jacopo Mondi wrote:\n> Add a '-s|--size' option to qcam to allow selecting the stream\n> resolution using a command line option.\n> \n> If the sizes are not supported by the camera, they get automatically\n> adjusted and the user notified via an output message.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  src/qcam/main.cpp        |  8 ++++++++\n>  src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++++-\n>  src/qcam/main_window.h   |  1 +\n>  3 files changed, 39 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> index 106b8a162d9f..da942f3daed6 100644\n> --- a/src/qcam/main.cpp\n> +++ b/src/qcam/main.cpp\n> @@ -25,12 +25,20 @@ void signalHandler(int signal)\n>  \n>  OptionsParser::Options parseOptions(int argc, char *argv[])\n>  {\n> +\tKeyValueParser sizeParser;\n> +\tsizeParser.addOption(\"width\", OptionInteger, \"Width in pixels\",\n> +\t\t\t     ArgumentRequired);\n> +\tsizeParser.addOption(\"height\", OptionInteger, \"Height in pixels\",\n> +\t\t\t     ArgumentRequired);\n> +\n>  \tOptionsParser parser;\n>  \tparser.addOption(OptCamera, OptionString,\n>  \t\t\t \"Specify which camera to operate on\", \"camera\",\n>  \t\t\t ArgumentRequired, \"camera\");\n>  \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n>  \t\t\t \"help\");\n> +\tparser.addOption(OptSize, &sizeParser, \"Set the stream size\",\n> +\t\t\t \"size\", true);\n\nI wonder if we should not call this --stream to match with the cam \nutility, whit this and the comments pointed out by you.\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n>  \n>  \tOptionsParser::Options options = parser.parse(argc, argv);\n>  \tif (options.isSet(OptHelp))\n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 907d2423ed15..d9a30aa15db0 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -116,13 +116,42 @@ int MainWindow::startCapture()\n>  \tint ret;\n>  \n>  \tconfig_ = camera_->generateConfiguration({ StreamRole::VideoRecording });\n> +\n> +\tStreamConfiguration &cfg = config_->at(0);\n> +\tif (options_.isSet(OptSize)) {\n> +\t\tconst std::vector<OptionValue> &sizeOptions =\n> +\t\t\toptions_[OptSize].toArray();\n> +\n> +\t\t/* Set desired stream size if requested. */\n> +\t\tfor (auto const &value : sizeOptions) {\n> +\t\t\tKeyValueParser::Options opt = value.toKeyValues();\n> +\n> +\t\t\tif (opt.isSet(\"width\"))\n> +\t\t\t\tcfg.size.width = opt[\"width\"];\n> +\n> +\t\t\tif (opt.isSet(\"height\"))\n> +\t\t\t\tcfg.size.height = opt[\"height\"];\n> +\t\t}\n> +\t}\n> +\n> +\tCameraConfiguration::Status validation = config_->validate();\n> +\tif (validation == CameraConfiguration::Invalid) {\n> +\t\tstd::cerr << \"Faild to apply camera configuration\";\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\tif (validation == CameraConfiguration::Adjusted) {\n> +\t\tstd::cout << \"Stream sizes adjusted to \"\n> +\t\t\t  << cfg.size.width << \"x\" << cfg.size.height\n> +\t\t\t  << std::endl;\n> +\t}\n> +\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>  \t}\n>  \n> -\tconst StreamConfiguration &cfg = config_->at(0);\n>  \tStream *stream = cfg.stream();\n>  \tret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width,\n>  \t\t\t\t     cfg.size.height);\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index f58cb6a65b2b..b45cbca725fa 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -27,6 +27,7 @@ class ViewFinder;\n>  enum {\n>  \tOptCamera = 'c',\n>  \tOptHelp = 'h',\n> +\tOptSize = 's',\n>  };\n>  \n>  class MainWindow : public QMainWindow\n> -- \n> 2.21.0\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-pf1-x430.google.com (mail-pf1-x430.google.com\n\t[IPv6:2607:f8b0:4864:20::430])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 170E760E3F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 14 Jul 2019 09:19:36 +0200 (CEST)","by mail-pf1-x430.google.com with SMTP id 19so6049674pfa.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 14 Jul 2019 00:19:36 -0700 (PDT)","from localhost (softbank126159224182.bbtec.net. [126.159.224.182])\n\tby smtp.gmail.com with ESMTPSA id\n\td23sm11172907pjv.18.2019.07.14.00.19.33\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tSun, 14 Jul 2019 00:19:34 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=F6sioMNYCwQLglA0cqtGxWkJ0ZELTTckELmTb5ivhkw=;\n\tb=s4wVYTA2QPgFXEODl8lxQtMsOOe0zY6oVc/M2+vfeZSlkm8X0UPtNAFJ+TQgeA/QsP\n\tMXKD34ICjHTXXSQVbTbjWpaVIyEFweCn2wcoIA5VnUy9G1h0jbnsZu1eLeNienzKnfO3\n\tsRJqRODdsO0cQs4VGOhs4ixeDJ4kNmJpmH6xOh+LPQgOk2OgLxZCNAwHmrrwnNkRdxYd\n\tT1LRQu+9Fuu/AvlGpIfQJJL0EXHJdPgY9fq8TN73HJTcFO08JqA526ajZl1RsW/fbCmy\n\t3Q0wCgkj52CzGP94rJb+L7GvgGBD5qlmcHJFSi4b8qnSSsYueJ+c8F8+B/5xlrlJVIwg\n\tSzDg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=F6sioMNYCwQLglA0cqtGxWkJ0ZELTTckELmTb5ivhkw=;\n\tb=KeGqsBL+ZH/1DiRUWLOTxR5XkbmHQVcrHEonAQKz8/I/OuFekNPCkb58r/heGmlUhj\n\tRS0UjbBmKUI15PPS2LBwEknqqWwKaUZHyu04XA8F56s0+qgtAzjeiAaMhA/+VYjSQuqR\n\tCD9KKtafs6xhi4xg7cBOe5L1zySzBHUYenLUGUqlOkuwN58cLZZENDvGbHGU6rPcwBhv\n\tZsBpDZBy1u1a+NtQdSu4wLNVh75VM9EGRSa2ewCR8Nt+r4Pl5euYiGWENtpNF5Y3ZRzm\n\teMeQ1iBNHqBs6LpKQHkxbt0yXMnAf8Xr7AbimQKJuRcb4wT280ZQNCS3dVBONGv9GuLT\n\tplSQ==","X-Gm-Message-State":"APjAAAUiFCKJczzeiHq8IorShsOqqnSNmQBv1qPDQcVAfmDI5JP9I0CV\n\tkZ1CxZDN1wwzxYvbCQjoYCDXrzraRT+ubg==","X-Google-Smtp-Source":"APXvYqxO3c83zvcQIiUJDCqeY40vUmnlg5CI4c59rgXCeBSYPuzDUKkGdBByUNkSwLV6W6OkYyC5pg==","X-Received":"by 2002:a17:90a:20a2:: with SMTP id\n\tf31mr22056390pjg.90.1563088774760; \n\tSun, 14 Jul 2019 00:19:34 -0700 (PDT)","Date":"Sun, 14 Jul 2019 16:19:30 +0900","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190714071930.GB31102@wyvern>","References":"<20190713145119.11193-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190713145119.11193-1-jacopo@jmondi.org>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Sun, 14 Jul 2019 07:19:36 -0000"}},{"id":2249,"web_url":"https://patchwork.libcamera.org/comment/2249/","msgid":"<20190714072331.GA4897@pendragon.ideasonboard.com>","date":"2019-07-14T07:23:31","subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Sat, Jul 13, 2019 at 04:56:25PM +0200, Jacopo Mondi wrote:\n> \"Don't rush when sending patches!\"\n\nOr reviews for that matter :-)\n\n> On Sat, Jul 13, 2019 at 04:51:19PM +0200, Jacopo Mondi wrote:\n> > Add a '-s|--size' option to qcam to allow selecting the stream\n> > resolution using a command line option.\n> >\n> > If the sizes are not supported by the camera, they get automatically\n> > adjusted and the user notified via an output message.\n> >\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> >  src/qcam/main.cpp        |  8 ++++++++\n> >  src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++++-\n> >  src/qcam/main_window.h   |  1 +\n> >  3 files changed, 39 insertions(+), 1 deletion(-)\n> >\n> > diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> > index 106b8a162d9f..da942f3daed6 100644\n> > --- a/src/qcam/main.cpp\n> > +++ b/src/qcam/main.cpp\n> > @@ -25,12 +25,20 @@ void signalHandler(int signal)\n> >\n> >  OptionsParser::Options parseOptions(int argc, char *argv[])\n> >  {\n> > +\tKeyValueParser sizeParser;\n> > +\tsizeParser.addOption(\"width\", OptionInteger, \"Width in pixels\",\n> > +\t\t\t     ArgumentRequired);\n> > +\tsizeParser.addOption(\"height\", OptionInteger, \"Height in pixels\",\n> > +\t\t\t     ArgumentRequired);\n> > +\n> >  \tOptionsParser parser;\n> >  \tparser.addOption(OptCamera, OptionString,\n> >  \t\t\t \"Specify which camera to operate on\", \"camera\",\n> >  \t\t\t ArgumentRequired, \"camera\");\n> >  \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n> >  \t\t\t \"help\");\n> > +\tparser.addOption(OptSize, &sizeParser, \"Set the stream size\",\n> > +\t\t\t \"size\", true);\n> >\n> >  \tOptionsParser::Options options = parser.parse(argc, argv);\n> >  \tif (options.isSet(OptHelp))\n> > diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> > index 907d2423ed15..d9a30aa15db0 100644\n> > --- a/src/qcam/main_window.cpp\n> > +++ b/src/qcam/main_window.cpp\n> > @@ -116,13 +116,42 @@ int MainWindow::startCapture()\n> >  \tint ret;\n> >\n> >  \tconfig_ = camera_->generateConfiguration({ StreamRole::VideoRecording });\n> > +\n> > +\tStreamConfiguration &cfg = config_->at(0);\n> > +\tif (options_.isSet(OptSize)) {\n> > +\t\tconst std::vector<OptionValue> &sizeOptions =\n> > +\t\t\toptions_[OptSize].toArray();\n> > +\n> > +\t\t/* Set desired stream size if requested. */\n> > +\t\tfor (auto const &value : sizeOptions) {\n\nThe const keyword should come before auto.\n\n> > +\t\t\tKeyValueParser::Options opt = value.toKeyValues();\n> > +\n> > +\t\t\tif (opt.isSet(\"width\"))\n> > +\t\t\t\tcfg.size.width = opt[\"width\"];\n> > +\n> > +\t\t\tif (opt.isSet(\"height\"))\n> > +\t\t\t\tcfg.size.height = opt[\"height\"];\n> > +\t\t}\n> > +\t}\n> > +\n> > +\tCameraConfiguration::Status validation = config_->validate();\n> > +\tif (validation == CameraConfiguration::Invalid) {\n> > +\t\tstd::cerr << \"Faild to apply camera configuration\";\n\ns/Faild/Failed/\n\nAnd actually I would write \"Failed to create valid configuration\" as\nthis doesn't apply the configuration.\n\n> \n> Missing std::endl\n> \n> > +\t\treturn -EINVAL;\n> > +\t}\n> > +\n> > +\tif (validation == CameraConfiguration::Adjusted) {\n> > +\t\tstd::cout << \"Stream sizes adjusted to \"\n\ns/sizes/size/\n\n> > +\t\t\t  << cfg.size.width << \"x\" << cfg.size.height\n\ncfg.size.toString() ?\n\n> > +\t\t\t  << std::endl;\n> > +\t}\n> \n> I could have saved the { } but I actually like the symmetry with the\n> above case.\n> \n> Sorry for the trivial mistakes, just noticed.\n> \n> > +\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> >  \t}\n> >\n> > -\tconst StreamConfiguration &cfg = config_->at(0);\n> >  \tStream *stream = cfg.stream();\n> >  \tret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width,\n> >  \t\t\t\t     cfg.size.height);\n> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > index f58cb6a65b2b..b45cbca725fa 100644\n> > --- a/src/qcam/main_window.h\n> > +++ b/src/qcam/main_window.h\n> > @@ -27,6 +27,7 @@ class ViewFinder;\n> >  enum {\n> >  \tOptCamera = 'c',\n> >  \tOptHelp = 'h',\n> > +\tOptSize = 's',\n> >  };\n> >\n> >  class MainWindow : public QMainWindow","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4C16660E3F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 14 Jul 2019 09:24:01 +0200 (CEST)","from pendragon.ideasonboard.com (softbank126159224182.bbtec.net\n\t[126.159.224.182])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C431C2B2;\n\tSun, 14 Jul 2019 09:23:59 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1563089040;\n\tbh=cnCIGISQ2+VoEs9em7CEMgdPJzgxgJdB10GDMd6VNFY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=kQfTXkuAQw5q2Svk8CTLjSwk66ca097UXzOXcmBgDDzQN7rRoBDwnOW4MrvA6ie5u\n\tpasIoHVnOMoHnD4GmdFJpXqr3gFR5lKWRlyM/AlO/UTJFT6i+F5XNQrRJHiPIZ6tSE\n\tNMx+VSwGvD2+nTEso7p+rwHoXiT5rEfzuZarucRk=","Date":"Sun, 14 Jul 2019 10:23:31 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190714072331.GA4897@pendragon.ideasonboard.com>","References":"<20190713145119.11193-1-jacopo@jmondi.org>\n\t<20190713145625.idbcjlxupmdfiqqo@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190713145625.idbcjlxupmdfiqqo@uno.localdomain>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Sun, 14 Jul 2019 07:24:01 -0000"}},{"id":2270,"web_url":"https://patchwork.libcamera.org/comment/2270/","msgid":"<20190715060222.uu2ycl6oat2ysfcz@uno.localdomain>","date":"2019-07-15T06:02:22","subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas,\n\nOn Sun, Jul 14, 2019 at 04:19:30PM +0900, Niklas Söderlund wrote:\n> Hi Jacopo,\n>\n> Thanks for your work.\n>\n> On 2019-07-13 16:51:19 +0200, Jacopo Mondi wrote:\n> > Add a '-s|--size' option to qcam to allow selecting the stream\n> > resolution using a command line option.\n> >\n> > If the sizes are not supported by the camera, they get automatically\n> > adjusted and the user notified via an output message.\n> >\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> >  src/qcam/main.cpp        |  8 ++++++++\n> >  src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++++-\n> >  src/qcam/main_window.h   |  1 +\n> >  3 files changed, 39 insertions(+), 1 deletion(-)\n> >\n> > diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\n> > index 106b8a162d9f..da942f3daed6 100644\n> > --- a/src/qcam/main.cpp\n> > +++ b/src/qcam/main.cpp\n> > @@ -25,12 +25,20 @@ void signalHandler(int signal)\n> >\n> >  OptionsParser::Options parseOptions(int argc, char *argv[])\n> >  {\n> > +\tKeyValueParser sizeParser;\n> > +\tsizeParser.addOption(\"width\", OptionInteger, \"Width in pixels\",\n> > +\t\t\t     ArgumentRequired);\n> > +\tsizeParser.addOption(\"height\", OptionInteger, \"Height in pixels\",\n> > +\t\t\t     ArgumentRequired);\n> > +\n> >  \tOptionsParser parser;\n> >  \tparser.addOption(OptCamera, OptionString,\n> >  \t\t\t \"Specify which camera to operate on\", \"camera\",\n> >  \t\t\t ArgumentRequired, \"camera\");\n> >  \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n> >  \t\t\t \"help\");\n> > +\tparser.addOption(OptSize, &sizeParser, \"Set the stream size\",\n> > +\t\t\t \"size\", true);\n>\n> I wonder if we should not call this --stream to match with the cam\n> utility, whit this and the comments pointed out by you.\n>\n\nAs qcam does not support multiple streams, and this option only\nconfigure sizes (not even pixel formats), I would keep using 'sizes'\nas the option name.\n\n> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nThanks, I'll fix Laurent's comments, take your tag in and then push.\n\n>\n> >\n> >  \tOptionsParser::Options options = parser.parse(argc, argv);\n> >  \tif (options.isSet(OptHelp))\n> > diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> > index 907d2423ed15..d9a30aa15db0 100644\n> > --- a/src/qcam/main_window.cpp\n> > +++ b/src/qcam/main_window.cpp\n> > @@ -116,13 +116,42 @@ int MainWindow::startCapture()\n> >  \tint ret;\n> >\n> >  \tconfig_ = camera_->generateConfiguration({ StreamRole::VideoRecording });\n> > +\n> > +\tStreamConfiguration &cfg = config_->at(0);\n> > +\tif (options_.isSet(OptSize)) {\n> > +\t\tconst std::vector<OptionValue> &sizeOptions =\n> > +\t\t\toptions_[OptSize].toArray();\n> > +\n> > +\t\t/* Set desired stream size if requested. */\n> > +\t\tfor (auto const &value : sizeOptions) {\n> > +\t\t\tKeyValueParser::Options opt = value.toKeyValues();\n> > +\n> > +\t\t\tif (opt.isSet(\"width\"))\n> > +\t\t\t\tcfg.size.width = opt[\"width\"];\n> > +\n> > +\t\t\tif (opt.isSet(\"height\"))\n> > +\t\t\t\tcfg.size.height = opt[\"height\"];\n> > +\t\t}\n> > +\t}\n> > +\n> > +\tCameraConfiguration::Status validation = config_->validate();\n> > +\tif (validation == CameraConfiguration::Invalid) {\n> > +\t\tstd::cerr << \"Faild to apply camera configuration\";\n> > +\t\treturn -EINVAL;\n> > +\t}\n> > +\n> > +\tif (validation == CameraConfiguration::Adjusted) {\n> > +\t\tstd::cout << \"Stream sizes adjusted to \"\n> > +\t\t\t  << cfg.size.width << \"x\" << cfg.size.height\n> > +\t\t\t  << std::endl;\n> > +\t}\n> > +\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> >  \t}\n> >\n> > -\tconst StreamConfiguration &cfg = config_->at(0);\n> >  \tStream *stream = cfg.stream();\n> >  \tret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width,\n> >  \t\t\t\t     cfg.size.height);\n> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > index f58cb6a65b2b..b45cbca725fa 100644\n> > --- a/src/qcam/main_window.h\n> > +++ b/src/qcam/main_window.h\n> > @@ -27,6 +27,7 @@ class ViewFinder;\n> >  enum {\n> >  \tOptCamera = 'c',\n> >  \tOptHelp = 'h',\n> > +\tOptSize = 's',\n> >  };\n> >\n> >  class MainWindow : public QMainWindow\n> > --\n> > 2.21.0\n> >\n> > _______________________________________________\n> > libcamera-devel mailing list\n> > libcamera-devel@lists.libcamera.org\n> > https://lists.libcamera.org/listinfo/libcamera-devel\n>\n> --\n> Regards,\n> Niklas Söderlund","headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6455361A74\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Jul 2019 08:01:12 +0200 (CEST)","from uno.localdomain (unknown [104.132.146.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id 7F6FE240005;\n\tMon, 15 Jul 2019 06:01:05 +0000 (UTC)"],"Date":"Mon, 15 Jul 2019 08:02:22 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190715060222.uu2ycl6oat2ysfcz@uno.localdomain>","References":"<20190713145119.11193-1-jacopo@jmondi.org>\n\t<20190714071930.GB31102@wyvern>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"htdl4zayhnqesooy\"","Content-Disposition":"inline","In-Reply-To":"<20190714071930.GB31102@wyvern>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH] libcamera: qcam: Allow specifying\n\tsizes on command line","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Mon, 15 Jul 2019 06:01:12 -0000"}}]