{"id":8988,"url":"https://patchwork.libcamera.org/api/patches/8988/?format=json","web_url":"https://patchwork.libcamera.org/patch/8988/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200724191851.803350-2-niklas.soderlund@ragnatech.se>","date":"2020-07-24T19:18:49","name":"[libcamera-devel,v3,1/3] cam: Add option to disallow adjusting of requested formats","commit_ref":"01ea694003094b51bd96883055b11e52a011bef9","pull_url":null,"state":"accepted","archived":false,"hash":"58fa6dbf2e1d08de6f9233b0ba69651ade578a5e","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8988/mbox/","series":[{"id":1142,"url":"https://patchwork.libcamera.org/api/series/1142/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1142","date":"2020-07-24T19:18:48","name":"cam: Add options to make batch testing with cam easier","version":3,"mbox":"https://patchwork.libcamera.org/series/1142/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8988/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8988/checks/","tags":{},"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 01AE6BD86F\n\tfor ;\n\tFri, 24 Jul 2020 19:19:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 754F66124D;\n\tFri, 24 Jul 2020 21:19:18 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1CDB66039B\n\tfor ;\n\tFri, 24 Jul 2020 21:19:17 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 6709cb93-cde2-11ea-86ee-0050569116f7;\n\tFri, 24 Jul 2020 21:18:06 +0200 (CEST)"],"X-Halon-ID":"6709cb93-cde2-11ea-86ee-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Jul 2020 21:18:49 +0200","Message-Id":"<20200724191851.803350-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200724191851.803350-1-niklas.soderlund@ragnatech.se>","References":"<20200724191851.803350-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a '--strict-formats' option which fails the camera configuration\nstep if the format is adjusted,\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n* Changes since v2\n- Update logged messages to mention --strict-formats argument.\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(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 2512fe9da782165b..ead0abe3e2abf42d 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 disallowed by --strict-formats argument\"\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:\ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex 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__ */\n","prefixes":["libcamera-devel","v3","1/3"]}