{"id":468,"url":"https://patchwork.libcamera.org/api/patches/468/?format=json","web_url":"https://patchwork.libcamera.org/patch/468/","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":"<20190131234721.22606-9-laurent.pinchart@ideasonboard.com>","date":"2019-01-31T23:47:21","name":"[libcamera-devel,v2,8/8] cam: Add --format option to configure a stream","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"93270747167d6069f79e1467136ce201448b1d04","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/468/mbox/","series":[{"id":158,"url":"https://patchwork.libcamera.org/api/series/158/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=158","date":"2019-01-31T23:47:13","name":"cam: add --format option to configure a stream","version":2,"mbox":"https://patchwork.libcamera.org/series/158/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/468/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/468/checks/","tags":{},"headers":{"Return-Path":"","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 8658160DB4\n\tfor ;\n\tFri, 1 Feb 2019 00:47:47 +0100 (CET)","from pendragon.ideasonboard.com (85-76-34-136-nat.elisa-mobile.fi\n\t[85.76.34.136])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B8B8C41;\n\tFri, 1 Feb 2019 00:47:45 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548978467;\n\tbh=xFIyg9zzZw2AK7ncALS6AHk2bxVSGkTFDnwm+ZaO8Co=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dAeACrhg3exnB3aGyQhziU9kjF5WFQt8SvEAUQDGtPTFUsYCjt6Y/+Hi+s0eovvZN\n\tX3ofSJMdAb9KnsiJysqAvLvTEJPbZrhgwHpabqF5ss51LSO3fw1JupIiXQTbgh4tMk\n\t6adFl1/4/re9zzU1bZijNPuHZGrh3HnW60WBc1iA=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 1 Feb 2019 01:47:21 +0200","Message-Id":"<20190131234721.22606-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190131234721.22606-1-laurent.pinchart@ideasonboard.com>","References":"<20190131234721.22606-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 8/8] cam: Add --format option to\n\tconfigure a stream","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":"Thu, 31 Jan 2019 23:47:47 -0000"},"content":"From: Niklas Söderlund \n\nAdd an option to configure the first stream of a camera from an argument\nwith options and parse the width, height and pixel format from that\nlist.\n\nThe pixel format is still specified as a integer which should correspond\nto the kernels FOURCC identifiers. Going forward this should be turned\ninto a string representation and the cam parser should translate between\nthe two.\n\nSigned-off-by: Niklas Söderlund \nSigned-off-by: Laurent Pinchart \n---\nChanges since v1:\n\n- Don't rename OptCamera option\n- Reword the format options help texts\n- Use the new KeyValueParser integration\n---\n src/cam/main.cpp | 103 +++++++++++++++++++++++++++++++++++++++++------\n 1 file changed, 91 insertions(+), 12 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 7934d0bf4132..02d9b86f546f 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -21,6 +21,7 @@ OptionsParser::Options options;\n \n enum {\n \tOptCamera = 'c',\n+\tOptFormat = 'f',\n \tOptHelp = 'h',\n \tOptList = 'l',\n };\n@@ -35,11 +36,20 @@ void signalHandler(int signal)\n \n static int parseOptions(int argc, char *argv[])\n {\n-\tOptionsParser parser;\n+\tKeyValueParser formatKeyValue;\n+\tformatKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n+\t\t\t\t ArgumentRequired);\n+\tformatKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n+\t\t\t\t ArgumentRequired);\n+\tformatKeyValue.addOption(\"pixelformat\", OptionInteger, \"Pixel format\",\n+\t\t\t\t ArgumentRequired);\n \n+\tOptionsParser parser;\n \tparser.addOption(OptCamera, OptionString,\n \t\t\t \"Specify which camera to operate on\", \"camera\",\n \t\t\t ArgumentRequired, \"camera\");\n+\tparser.addOption(OptFormat, &formatKeyValue,\n+\t\t\t \"Set format of the camera's first stream\", \"format\");\n \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n \t\t\t \"help\");\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n@@ -56,6 +66,47 @@ static int parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n+int str2uint(std::string str, unsigned int *dest)\n+{\n+\tif (!dest || str == \"\" || !sscanf(str.c_str(), \"%d\", dest))\n+\t\treturn -EINVAL;\n+\treturn 0;\n+}\n+\n+bool configureStreams(Camera *camera, std::vector &streams)\n+{\n+\tKeyValueParser::Options format = options[OptFormat];\n+\n+\tif (streams.size() != 1) {\n+\t\tstd::cout << \"Camera has \" << streams.size()\n+\t\t\t << \" streams, I only know how to work with 1\"\n+\t\t\t << std::endl;\n+\t\treturn false;\n+\t}\n+\tStream *id = streams.front();\n+\n+\tstd::map config =\n+\t\tcamera->streamConfiguration(streams);\n+\n+\tif (format.isSet(\"width\"))\n+\t\tif (str2uint(format[\"width\"], &config[id].width))\n+\t\t\treturn false;\n+\n+\tif (format.isSet(\"height\"))\n+\t\tif (str2uint(format[\"height\"], &config[id].height))\n+\t\t\treturn false;\n+\n+\t/* TODO: Translate 4CC string to ID. */\n+\tif (format.isSet(\"pixelformat\"))\n+\t\tif (str2uint(format[\"pixelformat\"], &config[id].pixelFormat))\n+\t\t\treturn false;\n+\n+\tif (camera->configureStreams(config))\n+\t\treturn false;\n+\n+\treturn true;\n+}\n+\n int main(int argc, char **argv)\n {\n \tint ret;\n@@ -65,6 +116,8 @@ int main(int argc, char **argv)\n \t\treturn EXIT_FAILURE;\n \n \tCameraManager *cm = CameraManager::instance();\n+\tstd::shared_ptr camera;\n+\tstd::vector streams;\n \n \tret = cm->start();\n \tif (ret) {\n@@ -73,31 +126,57 @@ int main(int argc, char **argv)\n \t\treturn EXIT_FAILURE;\n \t}\n \n+\tloop = new EventLoop(cm->eventDispatcher());\n+\n+\tstruct sigaction sa = {};\n+\tsa.sa_handler = &signalHandler;\n+\tsigaction(SIGINT, &sa, nullptr);\n+\n \tif (options.isSet(OptList)) {\n \t\tstd::cout << \"Available cameras:\" << std::endl;\n-\t\tfor (const std::shared_ptr &camera : cm->cameras())\n-\t\t\tstd::cout << \"- \" << camera->name() << std::endl;\n+\t\tfor (const std::shared_ptr &cam : cm->cameras())\n+\t\t\tstd::cout << \"- \" << cam->name() << std::endl;\n \t}\n \n \tif (options.isSet(OptCamera)) {\n-\t\tstd::shared_ptr cam = cm->get(options[OptCamera]);\n-\n-\t\tif (cam) {\n-\t\t\tstd::cout << \"Using camera \" << cam->name() << std::endl;\n-\t\t} else {\n+\t\tcamera = cm->get(options[OptCamera]);\n+\t\tif (!camera) {\n \t\t\tstd::cout << \"Camera \" << options[OptCamera]\n \t\t\t\t << \" not found\" << std::endl;\n+\t\t\tgoto out;\n+\t\t}\n+\n+\t\tstreams = camera->streams();\n+\n+\t\tif (camera->acquire()) {\n+\t\t\tstd::cout << \"Failed to acquire camera\" << std::endl;\n+\t\t\tgoto out;\n \t\t}\n+\n+\t\tstd::cout << \"Using camera \" << camera->name() << std::endl;\n \t}\n \n-\tloop = new EventLoop(cm->eventDispatcher());\n+\tif (options.isSet(OptFormat)) {\n+\t\tif (!camera) {\n+\t\t\tstd::cout << \"Can't configure stream, no camera selected\"\n+\t\t\t\t << std::endl;\n+\t\t\tgoto out_camera;\n+\t\t}\n \n-\tstruct sigaction sa = {};\n-\tsa.sa_handler = &signalHandler;\n-\tsigaction(SIGINT, &sa, nullptr);\n+\t\tif (!configureStreams(camera.get(), streams)) {\n+\t\t\tstd::cout << \"Failed to configure camera\" << std::endl;\n+\t\t\tgoto out_camera;\n+\t\t}\n+\t}\n \n \tret = loop->exec();\n \n+out_camera:\n+\tif (camera) {\n+\t\tcamera->release();\n+\t\tcamera.reset();\n+\t}\n+out:\n \tdelete loop;\n \n \tcm->stop();\n","prefixes":["libcamera-devel","v2","8/8"]}