{"id":613,"url":"https://patchwork.libcamera.org/api/patches/613/?format=json","web_url":"https://patchwork.libcamera.org/patch/613/","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":"<20190224173701.8587-5-niklas.soderlund@ragnatech.se>","date":"2019-02-24T17:37:01","name":"[libcamera-devel,v2,4/4] cam: fix return type of configureStreams()","commit_ref":"2090f8fdd8f903683349f650ac572c15cd8a224e","pull_url":null,"state":"accepted","archived":false,"hash":"53ad1191d87e8120b55fdd2c5ca113f7180b4d59","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/613/mbox/","series":[{"id":190,"url":"https://patchwork.libcamera.org/api/series/190/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=190","date":"2019-02-24T17:36:57","name":"libcamera: enforce stream configuration","version":2,"mbox":"https://patchwork.libcamera.org/series/190/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/613/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/613/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8CFA2610C0\n\tfor ;\n\tSun, 24 Feb 2019 18:37:13 +0100 (CET)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid d1354af2-385a-11e9-b5ae-0050569116f7;\n\tSun, 24 Feb 2019 18:37:12 +0100 (CET)"],"X-Halon-ID":"d1354af2-385a-11e9-b5ae-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 24 Feb 2019 18:37:01 +0100","Message-Id":"<20190224173701.8587-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190224173701.8587-1-niklas.soderlund@ragnatech.se>","References":"<20190224173701.8587-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 4/4] cam: fix return type of\n\tconfigureStreams()","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":"Sun, 24 Feb 2019 17:37:13 -0000"},"content":"The only caller of configureStreams() stores its return value as an int\nand not bool. This is confusing and also prevents the (possibly)\ndifferent error codes returned by Camera::configureStreams() to be\npropagated inside the cam tool. Fix this by changing the return type to\nint and propagate the return value from the camera.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/cam/main.cpp | 7 ++-----\n 1 file changed, 2 insertions(+), 5 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 9b67ab75a6a1663e..7c47ce652aa025d1 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -78,7 +78,7 @@ static int parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n-static bool configureStreams(Camera *camera, std::vector &streams)\n+static int configureStreams(Camera *camera, std::vector &streams)\n {\n \tKeyValueParser::Options format = options[OptFormat];\n \tStream *id = streams.front();\n@@ -98,10 +98,7 @@ static bool configureStreams(Camera *camera, std::vector &streams)\n \t\t\tconfig[id].pixelFormat = format[\"pixelformat\"];\n \t}\n \n-\tif (camera->configureStreams(config))\n-\t\treturn false;\n-\n-\treturn true;\n+\treturn camera->configureStreams(config);\n }\n \n static void requestComplete(Request *request, const std::map &buffers)\n","prefixes":["libcamera-devel","v2","4/4"]}