Patch Detail
Show a patch.
GET /api/patches/782/?format=api
{ "id": 782, "url": "https://patchwork.libcamera.org/api/patches/782/?format=api", "web_url": "https://patchwork.libcamera.org/patch/782/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190322015349.14934-5-niklas.soderlund@ragnatech.se>", "date": "2019-03-22T01:53:49", "name": "[libcamera-devel,RFC,4/4] cam: Allow specifying configuration for more then one stream", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "8bbc7d6e3e1f3d9c9089080897f05340f354d985", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/782/mbox/", "series": [ { "id": 215, "url": "https://patchwork.libcamera.org/api/series/215/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=215", "date": "2019-03-22T01:53:45", "name": "cam: Extend to support configuration of multiple streams", "version": 1, "mbox": "https://patchwork.libcamera.org/series/215/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/782/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/782/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "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 8D384611AB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 22 Mar 2019 02:54:09 +0100 (CET)", "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 6166268b-4c45-11e9-985a-005056917f90;\n\tFri, 22 Mar 2019 02:54:08 +0100 (CET)" ], "X-Halon-ID": "6166268b-4c45-11e9-985a-005056917f90", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 22 Mar 2019 02:53:49 +0100", "Message-Id": "<20190322015349.14934-5-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190322015349.14934-1-niklas.soderlund@ragnatech.se>", "References": "<20190322015349.14934-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC 4/4] cam: Allow specifying configuration for\n\tmore then one stream", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Fri, 22 Mar 2019 01:54:11 -0000" }, "content": "As a step to allow multiple streams extend the cam tool to be able to\nconfigure more then one stream. At this point libcamera do not allow an\napplication to associate a stream with a intended use-case so instead\nadd a 'id' field to the --format parser.\n\nThe numerical id represent the order in the array of streams which are\nhanded to the application from the library. This should change once the\nlibrary learns stream use-case. This implementation is a small and\nincomplete step in the direction of extending the cam utility to support\ncameras with more then one stream.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/cam/main.cpp | 39 ++++++++++++++++++++++++++++-----------\n 1 file changed, 28 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 1ca7862bf237d85f..c9239ac62a83ce31 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -42,6 +42,8 @@ void signalHandler(int signal)\n static int parseOptions(int argc, char *argv[])\n {\n \tKeyValueParser formatKeyValue;\n+\tformatKeyValue.addOption(\"id\", OptionInteger, \"ID of stream\",\n+\t\t\t\t ArgumentRequired);\n \tformatKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n \t\t\t\t ArgumentRequired);\n \tformatKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n@@ -61,7 +63,7 @@ static int parseOptions(int argc, char *argv[])\n \t\t\t \"The default file name is 'frame-#.bin'.\",\n \t\t\t \"file\", ArgumentOptional, \"filename\");\n \tparser.addOption(OptFormat, &formatKeyValue,\n-\t\t\t \"Set format of the camera's first stream\", \"format\");\n+\t\t\t \"Set format of the camera's first stream\", \"format\", true);\n \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n \t\t\t \"help\");\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n@@ -77,22 +79,37 @@ static int parseOptions(int argc, char *argv[])\n \n static int configureStreams(Camera *camera, std::set<Stream *> &streams)\n {\n-\tKeyValueParser::Options format = options[OptFormat];\n-\tStream *id = *streams.begin();\n-\n \tstd::map<Stream *, StreamConfiguration> config =\n \t\tcamera->streamConfiguration(streams);\n \n \tif (options.isSet(OptFormat)) {\n-\t\tif (format.isSet(\"width\"))\n-\t\t\tconfig[id].width = format[\"width\"];\n+\t\tint num = 0;\n+\t\tfor (Stream *id : streams) {\n+\t\t\tfor (auto const &value : options[OptFormat].toArray()) {\n+\t\t\t\tKeyValueParser::Options format = value.toKeyValues();\n \n-\t\tif (format.isSet(\"height\"))\n-\t\t\tconfig[id].height = format[\"height\"];\n+\t\t\t\tif (!format.isSet(\"id\") || format[\"id\"] != num)\n+\t\t\t\t\tcontinue;\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\tif (format.isSet(\"width\"))\n+\t\t\t\t\tconfig[id].width = format[\"width\"];\n+\n+\t\t\t\tif (format.isSet(\"height\"))\n+\t\t\t\t\tconfig[id].height = format[\"height\"];\n+\n+\t\t\t\t/* TODO: Translate 4CC string to ID. */\n+\t\t\t\tif (format.isSet(\"pixelformat\"))\n+\t\t\t\t\tconfig[id].pixelFormat = format[\"pixelformat\"];\n+\t\t\t}\n+\t\t\tnum++;\n+\t\t}\n+\t}\n+\n+\tfor (auto const &it : config) {\n+\t\tconst StreamConfiguration &conf = it.second;\n+\n+\t\tstd::cout << \"size: \" << conf.width << \"x\" << conf.height\n+\t\t\t << \"pixelformat: \" << conf.pixelFormat << std::endl;\n \t}\n \n \treturn camera->configureStreams(config);\n", "prefixes": [ "libcamera-devel", "RFC", "4/4" ] }