[{"id":1255,"web_url":"https://patchwork.libcamera.org/comment/1255/","msgid":"<20190403133139.qhazsspntg2wrxww@uno.localdomain>","date":"2019-04-03T13:31:39","subject":"Re: [libcamera-devel] [PATCH v2 1/4] cam: Rename --format to\n\t--stream","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas\n\nOn Wed, Apr 03, 2019 at 03:12:32AM +0200, Niklas Söderlund wrote:\n> More than format information needs to be configured for each stream to\n\nMore than one\nto be supplied (you use configured below)\n\n> allow multiple streams to be configured. Rename the option and adapt all\n> uses of it. There is no functional change except the rename.\n\ns/uses/usages\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n>\n> Signed-off-by: Niklas Söderlund \n> Reviewed-by: Laurent Pinchart \n> ---\n> src/cam/main.cpp | 30 +++++++++++++++---------------\n> 1 file changed, 15 insertions(+), 15 deletions(-)\n>\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 030003f081bdddda..6bf5e5926704d6e9 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -28,9 +28,9 @@ enum {\n> \tOptCamera = 'c',\n> \tOptCapture = 'C',\n> \tOptFile = 'F',\n> -\tOptFormat = 'f',\n> \tOptHelp = 'h',\n> \tOptList = 'l',\n> +\tOptStream = 's',\n> };\n>\n> void signalHandler(int signal)\n> @@ -41,12 +41,12 @@ void signalHandler(int signal)\n>\n> static int parseOptions(int argc, char *argv[])\n> {\n> -\tKeyValueParser formatKeyValue;\n> -\tformatKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n> +\tKeyValueParser streamKeyValue;\n> +\tstreamKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n> \t\t\t\t ArgumentRequired);\n> -\tformatKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n> +\tstreamKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n> \t\t\t\t ArgumentRequired);\n> -\tformatKeyValue.addOption(\"pixelformat\", OptionInteger, \"Pixel format\",\n> +\tstreamKeyValue.addOption(\"pixelformat\", OptionInteger, \"Pixel format\",\n> \t\t\t\t ArgumentRequired);\n>\n> \tOptionsParser parser;\n> @@ -60,8 +60,8 @@ static int parseOptions(int argc, char *argv[])\n> \t\t\t \"The first '#' character in the file name is expanded to the frame sequence number.\\n\"\n> \t\t\t \"The default file name is 'frame-#.bin'.\",\n> \t\t\t \"file\", ArgumentOptional, \"filename\");\n> -\tparser.addOption(OptFormat, &formatKeyValue,\n> -\t\t\t \"Set format of the camera's first stream\", \"format\");\n> +\tparser.addOption(OptStream, &streamKeyValue,\n> +\t\t\t \"Set configuration of a camera stream\", \"stream\");\n> \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n> \t\t\t \"help\");\n> \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n> @@ -84,18 +84,18 @@ static int prepareCameraConfig(std::map *config)\n> \t*config = camera->streamConfiguration({ Stream::VideoRecording() });\n> \tStream *stream = config->begin()->first;\n>\n> -\tif (options.isSet(OptFormat)) {\n> -\t\tKeyValueParser::Options format = options[OptFormat];\n> +\tif (options.isSet(OptStream)) {\n> +\t\tKeyValueParser::Options conf = options[OptStream];\n>\n> -\t\tif (format.isSet(\"width\"))\n> -\t\t\t(*config)[stream].width = format[\"width\"];\n> +\t\tif (conf.isSet(\"width\"))\n> +\t\t\t(*config)[stream].width = conf[\"width\"];\n>\n> -\t\tif (format.isSet(\"height\"))\n> -\t\t\t(*config)[stream].height = format[\"height\"];\n> +\t\tif (conf.isSet(\"height\"))\n> +\t\t\t(*config)[stream].height = conf[\"height\"];\n>\n> \t\t/* TODO: Translate 4CC string to ID. */\n> -\t\tif (format.isSet(\"pixelformat\"))\n> -\t\t\t(*config)[stream].pixelFormat = format[\"pixelformat\"];\n> +\t\tif (conf.isSet(\"pixelformat\"))\n> +\t\t\t(*config)[stream].pixelFormat = conf[\"pixelformat\"];\n> \t}\n>\n> \treturn 0;\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":"","Received":["from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D6137600FB\n\tfor ;\n\tWed, 3 Apr 2019 15:30:54 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 2BE68240019;\n\tWed, 3 Apr 2019 13:30:53 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Wed, 3 Apr 2019 15:31:39 +0200","From":"Jacopo Mondi ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190403133139.qhazsspntg2wrxww@uno.localdomain>","References":"<20190403011235.12782-1-niklas.soderlund@ragnatech.se>\n\t<20190403011235.12782-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"zq33lzsacmrdsrpl\"","Content-Disposition":"inline","In-Reply-To":"<20190403011235.12782-2-niklas.soderlund@ragnatech.se>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH v2 1/4] cam: Rename --format to\n\t--stream","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 03 Apr 2019 13:30:55 -0000"}}]