[{"id":1252,"web_url":"https://patchwork.libcamera.org/comment/1252/","msgid":"<20190403132022.htkxtfeztw2y6i5y@uno.localdomain>","date":"2019-04-03T13:20:22","subject":"Re: [libcamera-devel] [PATCH 1/5] cam: Rework how streams\n\tconfiguration is prepared","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:17AM +0200, Niklas Söderlund wrote:\n> In preparation of reworking how a default configuration is retrieved\n> from a camera separate preparation of stream configuration and\n> application into two different functions. Reason for this is that\n> preparation of camera configuration will become more complex.\n>\n\nReviewed-by: Jacopo Mondi \n\n> Signed-off-by: Niklas Söderlund \n> Reviewed-by: Laurent Pinchart \n> ---\n> src/cam/main.cpp | 35 ++++++++++++++++++++---------------\n> 1 file changed, 20 insertions(+), 15 deletions(-)\n>\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index e7490c32f99a01ad..b5895fae85699b26 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -78,27 +78,27 @@ static int parseOptions(int argc, char *argv[])\n> \treturn 0;\n> }\n>\n> -static int configureStreams(Camera *camera, std::set &streams)\n> +static int prepareCameraConfig(std::map *config)\n> {\n> -\tKeyValueParser::Options format = options[OptFormat];\n> -\tStream *id = *streams.begin();\n> -\n> -\tstd::map config =\n> -\t\tcamera->streamConfiguration(streams);\n> +\tstd::set streams = camera->streams();\n> +\t*config = camera->streamConfiguration(streams);\n> +\tStream *stream = config->begin()->first;\n>\n> \tif (options.isSet(OptFormat)) {\n> +\t\tKeyValueParser::Options format = options[OptFormat];\n> +\n> \t\tif (format.isSet(\"width\"))\n> -\t\t\tconfig[id].width = format[\"width\"];\n> +\t\t\t(*config)[stream].width = format[\"width\"];\n>\n> \t\tif (format.isSet(\"height\"))\n> -\t\t\tconfig[id].height = format[\"height\"];\n> +\t\t\t(*config)[stream].height = format[\"height\"];\n>\n> \t\t/* TODO: Translate 4CC string to ID. */\n> \t\tif (format.isSet(\"pixelformat\"))\n> -\t\t\tconfig[id].pixelFormat = format[\"pixelformat\"];\n> +\t\t\t(*config)[stream].pixelFormat = format[\"pixelformat\"];\n> \t}\n>\n> -\treturn camera->configureStreams(config);\n> +\treturn 0;\n> }\n>\n> static void requestComplete(Request *request, const std::map &buffers)\n> @@ -136,18 +136,23 @@ static void requestComplete(Request *request, const std::map\n>\n> static int capture()\n> {\n> -\tint ret;\n> -\n> -\tstd::set streams = camera->streams();\n> +\tstd::map config;\n> \tstd::vector requests;\n> +\tint ret;\n>\n> -\tret = configureStreams(camera.get(), streams);\n> +\tret = prepareCameraConfig(&config);\n> +\tif (ret) {\n> +\t\tstd::cout << \"Failed to prepare camera configuration\" << std::endl;\n> +\t\treturn ret;\n> +\t}\n> +\n> +\tret = camera->configureStreams(config);\n> \tif (ret < 0) {\n> \t\tstd::cout << \"Failed to configure camera\" << std::endl;\n> \t\treturn ret;\n> \t}\n>\n> -\tStream *stream = *streams.begin();\n> +\tStream *stream = config.begin()->first;\n>\n> \tret = camera->allocateBuffers();\n> \tif (ret) {\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 relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A5B51600FB\n\tfor ;\n\tWed, 3 Apr 2019 15:19:36 +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 relay12.mail.gandi.net (Postfix) with ESMTPSA id 3C83F200013;\n\tWed, 3 Apr 2019 13:19:36 +0000 (UTC)"],"Date":"Wed, 3 Apr 2019 15:20:22 +0200","From":"Jacopo Mondi ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190403132022.htkxtfeztw2y6i5y@uno.localdomain>","References":"<20190403011221.12711-1-niklas.soderlund@ragnatech.se>\n\t<20190403011221.12711-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"qo7splwggf4zqbbx\"","Content-Disposition":"inline","In-Reply-To":"<20190403011221.12711-2-niklas.soderlund@ragnatech.se>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH 1/5] cam: Rework how streams\n\tconfiguration is prepared","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:19:36 -0000"}}]