[{"id":1211,"web_url":"https://patchwork.libcamera.org/comment/1211/","msgid":"<20190402151349.GF4805@pendragon.ideasonboard.com>","date":"2019-04-02T15:13:49","subject":"Re: [libcamera-devel] [PATCH 1/4] cam: Rename --format to --stream","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Tue, Apr 02, 2019 at 02:54:03AM +0200, Niklas Söderlund wrote:\n> More then format information needs to be configured for each stream to\n\ns/then/than/\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> \n> Signed-off-by: Niklas Söderlund \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 0a248d042cfe772b..d3f1f341d44e7f98 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 the camera's streams\", \"stream\");\n\ns/the camera's streams/a camera stream/ ? The option configures a single\nstream, and can be specified multiple times to configure multiple\nstreams.\n\nReviewed-by: Laurent Pinchart \n\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 prepare_camera_config(std::map *config\n> \t*config = camera->streamConfiguration({ Video() });\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;","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F41C600FB\n\tfor ;\n\tTue, 2 Apr 2019 17:14:00 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F2DFE2F9;\n\tTue, 2 Apr 2019 17:13:59 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1554218040;\n\tbh=QiEvjMg4/ffHYFWqLCeSilmebYWaHzLdu1NF2Kxpndk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=mFINhUGyxFqVRthgcl0G1/4tkM4HYB3kqpjYeniK/WZH9jsvt+tXiF2MiKmHOcn4O\n\ttg8KAlVUgWIwXKznz4u2LqEyCzsPbmshpEtpMDBC9V6S2Qq5TiT+A4PvlgCD5MpfGt\n\tylDLFsl1TI3dmxCHuI4ZNaE1WL6l/y4muuHe5c/s=","Date":"Tue, 2 Apr 2019 18:13:49 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190402151349.GF4805@pendragon.ideasonboard.com>","References":"<20190402005406.25097-1-niklas.soderlund@ragnatech.se>\n\t<20190402005406.25097-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190402005406.25097-2-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 1/4] cam: Rename --format to --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":"Tue, 02 Apr 2019 15:14:00 -0000"}}]