[{"id":11582,"web_url":"https://patchwork.libcamera.org/comment/11582/","msgid":"<20200724175614.GX5921@pendragon.ideasonboard.com>","date":"2020-07-24T17:56:14","subject":"Re: [libcamera-devel] [PATCH v2 1/3] cam: Add option to disallow\n\tadjusting of requested formats","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 Fri, Jul 24, 2020 at 07:48:25PM +0200, Niklas Söderlund wrote:\n> Add a '--strict-formats' option which fails the camera configuration\n> step if the format is adjusted,\n> \n> Signed-off-by: Niklas Söderlund \n> Reviewed-by: Kieran Bingham \n> ---\n> * Changes since v1\n> - Fix spelling in comment and log outputs.\n> ---\n> src/cam/main.cpp | 17 ++++++++++++++++-\n> src/cam/main.h | 1 +\n> 2 files changed, 17 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 2512fe9da782165b..2009f11b6c336f2c 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -49,12 +49,15 @@ private:\n> \tstd::shared_ptr camera_;\n> \tstd::unique_ptr config_;\n> \tEventLoop *loop_;\n> +\n> +\tbool strictFormats_;\n> };\n> \n> CamApp *CamApp::app_ = nullptr;\n> \n> CamApp::CamApp()\n> -\t: cm_(nullptr), camera_(nullptr), config_(nullptr), loop_(nullptr)\n> +\t: cm_(nullptr), camera_(nullptr), config_(nullptr), loop_(nullptr),\n> +\t strictFormats_(false)\n> {\n> \tCamApp::app_ = this;\n> }\n> @@ -77,6 +80,9 @@ int CamApp::init(int argc, char **argv)\n> \tif (ret < 0)\n> \t\treturn ret;\n> \n> +\tif (options_.isSet(OptStrictFormats))\n> +\t\tstrictFormats_ = true;\n> +\n> \tcm_ = new CameraManager();\n> \n> \tret = cm_->start();\n> @@ -179,6 +185,9 @@ int CamApp::parseOptions(int argc, char *argv[])\n> \t\t\t \"list-controls\");\n> \tparser.addOption(OptListProperties, OptionNone, \"List cameras properties\",\n> \t\t\t \"list-properties\");\n> +\tparser.addOption(OptStrictFormats, OptionNone,\n> +\t\t\t \"Do not allow requested stream format(s) to be adjusted\",\n> +\t\t\t \"strict-formats\");\n> \n> \toptions_ = parser.parse(argc, argv);\n> \tif (!options_.valid())\n> @@ -214,6 +223,12 @@ int CamApp::prepareConfig()\n> \tcase CameraConfiguration::Valid:\n> \t\tbreak;\n> \tcase CameraConfiguration::Adjusted:\n> +\t\tif (strictFormats_) {\n> +\t\t\tstd::cout << \"Adjusting camera configuration not allowed\"\n\nMaybe \"Adjusting camera configuration disallowed by --strict-formats argument\" ?\n\nReviewed-by: Laurent Pinchart \n\n> +\t\t\t\t << std::endl;\n> +\t\t\tconfig_.reset();\n> +\t\t\treturn -EINVAL;\n> +\t\t}\n> \t\tstd::cout << \"Camera configuration adjusted\" << std::endl;\n> \t\tbreak;\n> \tcase CameraConfiguration::Invalid:\n> diff --git a/src/cam/main.h b/src/cam/main.h\n> index 4a130d8dd2906ad4..6f95add31a6341cf 100644\n> --- a/src/cam/main.h\n> +++ b/src/cam/main.h\n> @@ -17,6 +17,7 @@ enum {\n> \tOptListProperties = 'p',\n> \tOptStream = 's',\n> \tOptListControls = 256,\n> +\tOptStrictFormats = 257,\n> };\n> \n> #endif /* __CAM_MAIN_H__ */","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E3106BD878\n\tfor ;\n\tFri, 24 Jul 2020 17:56:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7D8076121D;\n\tFri, 24 Jul 2020 19:56:22 +0200 (CEST)","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 9F09B6039B\n\tfor ;\n\tFri, 24 Jul 2020 19:56:21 +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 1124B538;\n\tFri, 24 Jul 2020 19:56:20 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"dv7q6bTY\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1595613381;\n\tbh=UBb9TaB+bPFTbTY8gw/UoFLllioTOTFV9oRauxHVMfg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dv7q6bTYJqcNpq+4RBao0CqaO31ed7/v0qdu4YbxV14fd/RWkOjLvGLOSutv5TpXr\n\tJfdXeVWyNqC44oWI+flT5zt/roGEWzZ4vrwBxcFgp0QhOPxOdtgIUVHNojLtFJ3cx2\n\t//kHAdbxbSUT3+FvOsB2DWgNVYM7n4YbCM0DWbR4=","Date":"Fri, 24 Jul 2020 20:56:14 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"<20200724175614.GX5921@pendragon.ideasonboard.com>","References":"<20200724174827.757493-1-niklas.soderlund@ragnatech.se>\n\t<20200724174827.757493-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200724174827.757493-2-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH v2 1/3] cam: Add option to disallow\n\tadjusting of requested formats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]