Patch Detail
Show a patch.
GET /api/patches/838/?format=api
{ "id": 838, "url": "https://patchwork.libcamera.org/api/patches/838/?format=api", "web_url": "https://patchwork.libcamera.org/patch/838/", "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": "<20190402005406.25097-2-niklas.soderlund@ragnatech.se>", "date": "2019-04-02T00:54:03", "name": "[libcamera-devel,1/4] cam: Rename --format to --stream", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7ef28a53fd175ca9cbf8d0d22f633bf563245eda", "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/838/mbox/", "series": [ { "id": 228, "url": "https://patchwork.libcamera.org/api/series/228/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=228", "date": "2019-04-02T00:54:02", "name": "cam: Add support to specify multiple stream configurations with hints", "version": 1, "mbox": "https://patchwork.libcamera.org/series/228/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/838/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/838/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 BDDEB610BF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 2 Apr 2019 02:54:33 +0200 (CEST)", "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid e10d5c06-54e1-11e9-846a-005056917a89;\n\tTue, 02 Apr 2019 02:54:33 +0200 (CEST)" ], "X-Halon-ID": "e10d5c06-54e1-11e9-846a-005056917a89", "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": "Tue, 2 Apr 2019 02:54:03 +0200", "Message-Id": "<20190402005406.25097-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190402005406.25097-1-niklas.soderlund@ragnatech.se>", "References": "<20190402005406.25097-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 1/4] cam: Rename --format to --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": "Tue, 02 Apr 2019 00:54:34 -0000" }, "content": "More then format information needs to be configured for each stream to\nallow multiple streams to be configured. Rename the option and adapt all\nuses of it. There is no functional change except the rename.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/cam/main.cpp | 30 +++++++++++++++---------------\n 1 file changed, 15 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 0a248d042cfe772b..d3f1f341d44e7f98 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -28,9 +28,9 @@ enum {\n \tOptCamera = 'c',\n \tOptCapture = 'C',\n \tOptFile = 'F',\n-\tOptFormat = 'f',\n \tOptHelp = 'h',\n \tOptList = 'l',\n+\tOptStream = 's',\n };\n \n void signalHandler(int signal)\n@@ -41,12 +41,12 @@ void signalHandler(int signal)\n \n static int parseOptions(int argc, char *argv[])\n {\n-\tKeyValueParser formatKeyValue;\n-\tformatKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n+\tKeyValueParser streamKeyValue;\n+\tstreamKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n \t\t\t\t ArgumentRequired);\n-\tformatKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n+\tstreamKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n \t\t\t\t ArgumentRequired);\n-\tformatKeyValue.addOption(\"pixelformat\", OptionInteger, \"Pixel format\",\n+\tstreamKeyValue.addOption(\"pixelformat\", OptionInteger, \"Pixel format\",\n \t\t\t\t ArgumentRequired);\n \n \tOptionsParser parser;\n@@ -60,8 +60,8 @@ static int parseOptions(int argc, char *argv[])\n \t\t\t \"The first '#' character in the file name is expanded to the frame sequence number.\\n\"\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+\tparser.addOption(OptStream, &streamKeyValue,\n+\t\t\t \"Set configuration of the camera's streams\", \"stream\");\n \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n \t\t\t \"help\");\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n@@ -84,18 +84,18 @@ static int prepare_camera_config(std::map<Stream *, StreamConfiguration> *config\n \t*config = camera->streamConfiguration({ Video() });\n \tStream *stream = config->begin()->first;\n \n-\tif (options.isSet(OptFormat)) {\n-\t\tKeyValueParser::Options format = options[OptFormat];\n+\tif (options.isSet(OptStream)) {\n+\t\tKeyValueParser::Options conf = options[OptStream];\n \n-\t\tif (format.isSet(\"width\"))\n-\t\t\t(*config)[stream].width = format[\"width\"];\n+\t\tif (conf.isSet(\"width\"))\n+\t\t\t(*config)[stream].width = conf[\"width\"];\n \n-\t\tif (format.isSet(\"height\"))\n-\t\t\t(*config)[stream].height = format[\"height\"];\n+\t\tif (conf.isSet(\"height\"))\n+\t\t\t(*config)[stream].height = conf[\"height\"];\n \n \t\t/* TODO: Translate 4CC string to ID. */\n-\t\tif (format.isSet(\"pixelformat\"))\n-\t\t\t(*config)[stream].pixelFormat = format[\"pixelformat\"];\n+\t\tif (conf.isSet(\"pixelformat\"))\n+\t\t\t(*config)[stream].pixelFormat = conf[\"pixelformat\"];\n \t}\n \n \treturn 0;\n", "prefixes": [ "libcamera-devel", "1/4" ] }