Patch Detail
Show a patch.
GET /api/1.1/patches/941/?format=api
{ "id": 941, "url": "https://patchwork.libcamera.org/api/1.1/patches/941/?format=api", "web_url": "https://patchwork.libcamera.org/patch/941/", "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": "<20190408134817.15247-2-niklas.soderlund@ragnatech.se>", "date": "2019-04-08T13:48:10", "name": "[libcamera-devel,v4,1/8] cam: Rework how streams configuration is prepared", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f59a6af8489613910923833bf6dca98b327a6500", "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/941/mbox/", "series": [ { "id": 245, "url": "https://patchwork.libcamera.org/api/1.1/series/245/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=245", "date": "2019-04-08T13:48:09", "name": "libcamera: stream: Add basic stream usages", "version": 4, "mbox": "https://patchwork.libcamera.org/series/245/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/941/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/941/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 98D0D60004\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 8 Apr 2019 15:48:40 +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 f9ac835b-5a04-11e9-846a-005056917a89;\n\tMon, 08 Apr 2019 15:48:34 +0200 (CEST)" ], "X-Halon-ID": "f9ac835b-5a04-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:48:10 +0200", "Message-Id": "<20190408134817.15247-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190408134817.15247-1-niklas.soderlund@ragnatech.se>", "References": "<20190408134817.15247-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/8] cam: Rework how streams\n\tconfiguration is prepared", "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:48:40 -0000" }, "content": "In preparation of reworking how a default configuration is retrieved\nfrom a camera separate preparation of stream configuration and\napplication into two different functions. Reason for this is that\npreparation of camera configuration will become more complex.\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 | 35 ++++++++++++++++++++---------------\n 1 file changed, 20 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex e7490c32f99a01ad..b5895fae85699b26 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -78,27 +78,27 @@ static int parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n-static int configureStreams(Camera *camera, std::set<Stream *> &streams)\n+static int prepareCameraConfig(std::map<Stream *, StreamConfiguration> *config)\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+\tstd::set<Stream *> streams = camera->streams();\n+\t*config = camera->streamConfiguration(streams);\n+\tStream *stream = config->begin()->first;\n \n \tif (options.isSet(OptFormat)) {\n+\t\tKeyValueParser::Options format = options[OptFormat];\n+\n \t\tif (format.isSet(\"width\"))\n-\t\t\tconfig[id].width = format[\"width\"];\n+\t\t\t(*config)[stream].width = format[\"width\"];\n \n \t\tif (format.isSet(\"height\"))\n-\t\t\tconfig[id].height = format[\"height\"];\n+\t\t\t(*config)[stream].height = format[\"height\"];\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(*config)[stream].pixelFormat = format[\"pixelformat\"];\n \t}\n \n-\treturn camera->configureStreams(config);\n+\treturn 0;\n }\n \n static void requestComplete(Request *request, const std::map<Stream *, Buffer *> &buffers)\n@@ -136,18 +136,23 @@ static void requestComplete(Request *request, const std::map<Stream *, Buffer *>\n \n static int capture()\n {\n-\tint ret;\n-\n-\tstd::set<Stream *> streams = camera->streams();\n+\tstd::map<Stream *, StreamConfiguration> config;\n \tstd::vector<Request *> requests;\n+\tint ret;\n \n-\tret = configureStreams(camera.get(), streams);\n+\tret = prepareCameraConfig(&config);\n+\tif (ret) {\n+\t\tstd::cout << \"Failed to prepare camera configuration\" << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\tret = camera->configureStreams(config);\n \tif (ret < 0) {\n \t\tstd::cout << \"Failed to configure camera\" << std::endl;\n \t\treturn ret;\n \t}\n \n-\tStream *stream = *streams.begin();\n+\tStream *stream = config.begin()->first;\n \n \tret = camera->allocateBuffers();\n \tif (ret) {\n", "prefixes": [ "libcamera-devel", "v4", "1/8" ] }