Patch Detail
Show a patch.
GET /api/1.1/patches/950/?format=api
{ "id": 950, "url": "https://patchwork.libcamera.org/api/1.1/patches/950/?format=api", "web_url": "https://patchwork.libcamera.org/patch/950/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20190408135006.15423-2-niklas.soderlund@ragnatech.se>", "date": "2019-04-08T13:50:02", "name": "[libcamera-devel,v4,1/5] cam: Rename --format to --stream", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e62558f8eb6be350cb93be331e48920c40392366", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/950/mbox/", "series": [ { "id": 246, "url": "https://patchwork.libcamera.org/api/1.1/series/246/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=246", "date": "2019-04-08T13:50:01", "name": "cam: Add support to specify multiple stream configurations with roles", "version": 4, "mbox": "https://patchwork.libcamera.org/series/246/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/950/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/950/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "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 91EE360B2E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 8 Apr 2019 15:50:32 +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 3be3024e-5a05-11e9-846a-005056917a89;\n\tMon, 08 Apr 2019 15:50:25 +0200 (CEST)" ], "X-Halon-ID": "3be3024e-5a05-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": "Mon, 8 Apr 2019 15:50:02 +0200", "Message-Id": "<20190408135006.15423-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190408135006.15423-1-niklas.soderlund@ragnatech.se>", "References": "<20190408135006.15423-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 1/5] 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": "Mon, 08 Apr 2019 13:50:32 -0000" }, "content": "More than format information needs to be supplied for each stream to\nallow multiple streams to be configured. Rename the option and adapt all\nusages of it. There is no functional change except the rename.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\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 99ce564afd695b07..41a4d9c6b7afa684 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 a camera stream\", \"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@@ -83,18 +83,18 @@ static int prepareCameraConfig(CameraConfiguration *config)\n \t*config = camera->streamConfiguration({ Stream::VideoRecording() });\n \tStream *stream = config->front();\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", "v4", "1/5" ] }