[{"id":1666,"web_url":"https://patchwork.libcamera.org/comment/1666/","msgid":"<20190523072120.h5gtcjirseg7ucgj@uno.localdomain>","date":"2019-05-23T07:21:20","subject":"Re: [libcamera-devel] [PATCH] cam: Rename conf variable referring\n\tto command line option to opt","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n  I welcome this change\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nOn Thu, May 23, 2019 at 01:12:10AM +0300, Laurent Pinchart wrote:\n> Naming a variable that refers to command line options 'conf' is\n> confusing as we using 'config' and 'cfg' to refer to camera and stream\n> configurations. Rename it to 'opt'.\n>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  src/cam/main.cpp | 26 +++++++++++++-------------\n>  1 file changed, 13 insertions(+), 13 deletions(-)\n>\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 5ecd7e0e38d7..4155889678ce 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -98,19 +98,19 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()\n>\n>  \t/* Use roles and get a default configuration. */\n>  \tfor (auto const &value : streamOptions) {\n> -\t\tKeyValueParser::Options conf = value.toKeyValues();\n> +\t\tKeyValueParser::Options opt = value.toKeyValues();\n>\n> -\t\tif (!conf.isSet(\"role\")) {\n> +\t\tif (!opt.isSet(\"role\")) {\n>  \t\t\troles.push_back(StreamRole::VideoRecording);\n> -\t\t} else if (conf[\"role\"].toString() == \"viewfinder\") {\n> +\t\t} else if (opt[\"role\"].toString() == \"viewfinder\") {\n>  \t\t\troles.push_back(StreamRole::Viewfinder);\n> -\t\t} else if (conf[\"role\"].toString() == \"video\") {\n> +\t\t} else if (opt[\"role\"].toString() == \"video\") {\n>  \t\t\troles.push_back(StreamRole::VideoRecording);\n> -\t\t} else if (conf[\"role\"].toString() == \"still\") {\n> +\t\t} else if (opt[\"role\"].toString() == \"still\") {\n>  \t\t\troles.push_back(StreamRole::StillCapture);\n>  \t\t} else {\n>  \t\t\tstd::cerr << \"Unknown stream role \"\n> -\t\t\t\t  << conf[\"role\"].toString() << std::endl;\n> +\t\t\t\t  << opt[\"role\"].toString() << std::endl;\n>  \t\t\treturn nullptr;\n>  \t\t}\n>  \t}\n> @@ -125,18 +125,18 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()\n>  \t/* Apply configuration explicitly requested. */\n>  \tunsigned int i = 0;\n>  \tfor (auto const &value : streamOptions) {\n> -\t\tKeyValueParser::Options conf = value.toKeyValues();\n> +\t\tKeyValueParser::Options opt = value.toKeyValues();\n>  \t\tStreamConfiguration &cfg = config->at(i++);\n>\n> -\t\tif (conf.isSet(\"width\"))\n> -\t\t\tcfg.size.width = conf[\"width\"];\n> +\t\tif (opt.isSet(\"width\"))\n> +\t\t\tcfg.size.width = opt[\"width\"];\n>\n> -\t\tif (conf.isSet(\"height\"))\n> -\t\t\tcfg.size.height = conf[\"height\"];\n> +\t\tif (opt.isSet(\"height\"))\n> +\t\t\tcfg.size.height = opt[\"height\"];\n>\n>  \t\t/* TODO: Translate 4CC string to ID. */\n> -\t\tif (conf.isSet(\"pixelformat\"))\n> -\t\t\tcfg.pixelFormat = conf[\"pixelformat\"];\n> +\t\tif (opt.isSet(\"pixelformat\"))\n> +\t\t\tcfg.pixelFormat = opt[\"pixelformat\"];\n>  \t}\n>\n>  \treturn config;\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 25FAA60BBB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 May 2019 09:20:14 +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 relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 5B4644001C;\n\tThu, 23 May 2019 07:20:13 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Thu, 23 May 2019 09:21:20 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190523072120.h5gtcjirseg7ucgj@uno.localdomain>","References":"<20190522221210.19257-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"okh545qvvvx7sqd3\"","Content-Disposition":"inline","In-Reply-To":"<20190522221210.19257-1-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH] cam: Rename conf variable referring\n\tto command line option to opt","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":"Thu, 23 May 2019 07:20:14 -0000"}},{"id":1678,"web_url":"https://patchwork.libcamera.org/comment/1678/","msgid":"<a982674c-2c89-816c-1615-b9a2ca1a397b@ideasonboard.com>","date":"2019-05-23T10:15:09","subject":"Re: [libcamera-devel] [PATCH] cam: Rename conf variable referring\n\tto command line option to opt","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 22/05/2019 23:12, Laurent Pinchart wrote:\n> Naming a variable that refers to command line options 'conf' is\n> confusing as we using 'config' and 'cfg' to refer to camera and stream\n> configurations. Rename it to 'opt'.\n> \n\nSounds fine to me, but you're going to be racing with Niklas on his\nseries...\n\nWho's going to rebase on top of the other ...\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nBut you should probably poke neg for an ack due to the patch conflicts\n\n\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  src/cam/main.cpp | 26 +++++++++++++-------------\n>  1 file changed, 13 insertions(+), 13 deletions(-)\n> \n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 5ecd7e0e38d7..4155889678ce 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -98,19 +98,19 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()\n>  \n>  \t/* Use roles and get a default configuration. */\n>  \tfor (auto const &value : streamOptions) {\n> -\t\tKeyValueParser::Options conf = value.toKeyValues();\n> +\t\tKeyValueParser::Options opt = value.toKeyValues();\n>  \n> -\t\tif (!conf.isSet(\"role\")) {\n> +\t\tif (!opt.isSet(\"role\")) {\n>  \t\t\troles.push_back(StreamRole::VideoRecording);\n> -\t\t} else if (conf[\"role\"].toString() == \"viewfinder\") {\n> +\t\t} else if (opt[\"role\"].toString() == \"viewfinder\") {\n>  \t\t\troles.push_back(StreamRole::Viewfinder);\n> -\t\t} else if (conf[\"role\"].toString() == \"video\") {\n> +\t\t} else if (opt[\"role\"].toString() == \"video\") {\n>  \t\t\troles.push_back(StreamRole::VideoRecording);\n> -\t\t} else if (conf[\"role\"].toString() == \"still\") {\n> +\t\t} else if (opt[\"role\"].toString() == \"still\") {\n>  \t\t\troles.push_back(StreamRole::StillCapture);\n>  \t\t} else {\n>  \t\t\tstd::cerr << \"Unknown stream role \"\n> -\t\t\t\t  << conf[\"role\"].toString() << std::endl;\n> +\t\t\t\t  << opt[\"role\"].toString() << std::endl;\n>  \t\t\treturn nullptr;\n>  \t\t}\n>  \t}\n> @@ -125,18 +125,18 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()\n>  \t/* Apply configuration explicitly requested. */\n>  \tunsigned int i = 0;\n>  \tfor (auto const &value : streamOptions) {\n> -\t\tKeyValueParser::Options conf = value.toKeyValues();\n> +\t\tKeyValueParser::Options opt = value.toKeyValues();\n>  \t\tStreamConfiguration &cfg = config->at(i++);\n>  \n> -\t\tif (conf.isSet(\"width\"))\n> -\t\t\tcfg.size.width = conf[\"width\"];\n> +\t\tif (opt.isSet(\"width\"))\n> +\t\t\tcfg.size.width = opt[\"width\"];\n>  \n> -\t\tif (conf.isSet(\"height\"))\n> -\t\t\tcfg.size.height = conf[\"height\"];\n> +\t\tif (opt.isSet(\"height\"))\n> +\t\t\tcfg.size.height = opt[\"height\"];\n>  \n>  \t\t/* TODO: Translate 4CC string to ID. */\n> -\t\tif (conf.isSet(\"pixelformat\"))\n> -\t\t\tcfg.pixelFormat = conf[\"pixelformat\"];\n> +\t\tif (opt.isSet(\"pixelformat\"))\n> +\t\t\tcfg.pixelFormat = opt[\"pixelformat\"];\n>  \t}\n>  \n>  \treturn config;\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 37F2660BBB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 May 2019 12:15:13 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 91A69334;\n\tThu, 23 May 2019 12:15:12 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558606512;\n\tbh=VMLdEWTOoYNysOaR8gKSuypEL7Q+heVupse0UhvTrSg=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=KvucLKxGaI0Z1O0CMStCw3UlgVqTjUQ+kTNBnP/T+NFeuA9G8k981BKTgZh0Z4uRl\n\te05ikSOQyE3BX0ur55zjtajQaOsWFHAIdjF/e99PXRpCyCj3v3MVCi8zvdX1tgybmg\n\tjHrShhmDFFsoMvzmml8B/sufxSOUH/BLqtLL6KC8=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20190522221210.19257-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<a982674c-2c89-816c-1615-b9a2ca1a397b@ideasonboard.com>","Date":"Thu, 23 May 2019 11:15:09 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.6.1","MIME-Version":"1.0","In-Reply-To":"<20190522221210.19257-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH] cam: Rename conf variable referring\n\tto command line option to opt","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":"Thu, 23 May 2019 10:15:13 -0000"}},{"id":1681,"web_url":"https://patchwork.libcamera.org/comment/1681/","msgid":"<20190523104255.GL4745@pendragon.ideasonboard.com>","date":"2019-05-23T10:42:55","subject":"Re: [libcamera-devel] [PATCH] cam: Rename conf variable referring\n\tto command line option to opt","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Thu, May 23, 2019 at 11:15:09AM +0100, Kieran Bingham wrote:\n> Hi Laurent,\n> \n> On 22/05/2019 23:12, Laurent Pinchart wrote:\n> > Naming a variable that refers to command line options 'conf' is\n> > confusing as we using 'config' and 'cfg' to refer to camera and stream\n> > configurations. Rename it to 'opt'.\n> \n> Sounds fine to me, but you're going to be racing with Niklas on his\n> series...\n> \n> Who's going to rebase on top of the other ...\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> But you should probably poke neg for an ack due to the patch conflicts\n\nI think Niklas will have to rebase, as I've pushed this already :-$\n\n> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> > ---\n> >  src/cam/main.cpp | 26 +++++++++++++-------------\n> >  1 file changed, 13 insertions(+), 13 deletions(-)\n> > \n> > diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> > index 5ecd7e0e38d7..4155889678ce 100644\n> > --- a/src/cam/main.cpp\n> > +++ b/src/cam/main.cpp\n> > @@ -98,19 +98,19 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()\n> >  \n> >  \t/* Use roles and get a default configuration. */\n> >  \tfor (auto const &value : streamOptions) {\n> > -\t\tKeyValueParser::Options conf = value.toKeyValues();\n> > +\t\tKeyValueParser::Options opt = value.toKeyValues();\n> >  \n> > -\t\tif (!conf.isSet(\"role\")) {\n> > +\t\tif (!opt.isSet(\"role\")) {\n> >  \t\t\troles.push_back(StreamRole::VideoRecording);\n> > -\t\t} else if (conf[\"role\"].toString() == \"viewfinder\") {\n> > +\t\t} else if (opt[\"role\"].toString() == \"viewfinder\") {\n> >  \t\t\troles.push_back(StreamRole::Viewfinder);\n> > -\t\t} else if (conf[\"role\"].toString() == \"video\") {\n> > +\t\t} else if (opt[\"role\"].toString() == \"video\") {\n> >  \t\t\troles.push_back(StreamRole::VideoRecording);\n> > -\t\t} else if (conf[\"role\"].toString() == \"still\") {\n> > +\t\t} else if (opt[\"role\"].toString() == \"still\") {\n> >  \t\t\troles.push_back(StreamRole::StillCapture);\n> >  \t\t} else {\n> >  \t\t\tstd::cerr << \"Unknown stream role \"\n> > -\t\t\t\t  << conf[\"role\"].toString() << std::endl;\n> > +\t\t\t\t  << opt[\"role\"].toString() << std::endl;\n> >  \t\t\treturn nullptr;\n> >  \t\t}\n> >  \t}\n> > @@ -125,18 +125,18 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()\n> >  \t/* Apply configuration explicitly requested. */\n> >  \tunsigned int i = 0;\n> >  \tfor (auto const &value : streamOptions) {\n> > -\t\tKeyValueParser::Options conf = value.toKeyValues();\n> > +\t\tKeyValueParser::Options opt = value.toKeyValues();\n> >  \t\tStreamConfiguration &cfg = config->at(i++);\n> >  \n> > -\t\tif (conf.isSet(\"width\"))\n> > -\t\t\tcfg.size.width = conf[\"width\"];\n> > +\t\tif (opt.isSet(\"width\"))\n> > +\t\t\tcfg.size.width = opt[\"width\"];\n> >  \n> > -\t\tif (conf.isSet(\"height\"))\n> > -\t\t\tcfg.size.height = conf[\"height\"];\n> > +\t\tif (opt.isSet(\"height\"))\n> > +\t\t\tcfg.size.height = opt[\"height\"];\n> >  \n> >  \t\t/* TODO: Translate 4CC string to ID. */\n> > -\t\tif (conf.isSet(\"pixelformat\"))\n> > -\t\t\tcfg.pixelFormat = conf[\"pixelformat\"];\n> > +\t\tif (opt.isSet(\"pixelformat\"))\n> > +\t\t\tcfg.pixelFormat = opt[\"pixelformat\"];\n> >  \t}\n> >  \n> >  \treturn config;","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 CCADD60BBB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 May 2019 12:43:12 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 67CB7583;\n\tThu, 23 May 2019 12:43:12 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558608192;\n\tbh=/lZun0TZW5r0os0/ZEUN2kuG0M1Veo8STYOUtpEbwG4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=AbGtGKckfK0vlSDURAi4AjS2CPEzXcU6BtvbJbEujeK98WuLDPeb7R0ZN0XHST0uU\n\tU5B04iI72ShWU/WRXDAt6y7gOIqDNu/PKgE7AKWv5M8gPkgXFLDnnO1U5lNt6Tc2aQ\n\tBG6hV2mV6ZU58eO8UTPq0JQcv2q1B3u9ykKPyITo=","Date":"Thu, 23 May 2019 13:42:55 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190523104255.GL4745@pendragon.ideasonboard.com>","References":"<20190522221210.19257-1-laurent.pinchart@ideasonboard.com>\n\t<a982674c-2c89-816c-1615-b9a2ca1a397b@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<a982674c-2c89-816c-1615-b9a2ca1a397b@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH] cam: Rename conf variable referring\n\tto command line option to opt","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":"Thu, 23 May 2019 10:43:13 -0000"}}]