Patch Detail
Show a patch.
GET /api/patches/540/?format=api
{ "id": 540, "url": "https://patchwork.libcamera.org/api/patches/540/?format=api", "web_url": "https://patchwork.libcamera.org/patch/540/", "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": "<20190206060818.13907-26-laurent.pinchart@ideasonboard.com>", "date": "2019-02-06T06:08:16", "name": "[libcamera-devel,25/27] cam: Add capture operation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4837d70e6e0760388cd4031835bb18fa9fb28c69", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/540/mbox/", "series": [ { "id": 170, "url": "https://patchwork.libcamera.org/api/series/170/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=170", "date": "2019-02-06T06:07:51", "name": "Capture frames throught requests", "version": 1, "mbox": "https://patchwork.libcamera.org/series/170/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/540/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/540/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 86BFB61031\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 6 Feb 2019 07:08:29 +0100 (CET)", "from pendragon.ideasonboard.com (d51A4137F.access.telenet.be\n\t[81.164.19.127])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3262441\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 6 Feb 2019 07:08:29 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1549433309;\n\tbh=EZ0uI2hILy2K6NEikaRZG1CpzfbRdZLF5+lgdsyEO6Q=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=MOvCcGmLTjTceq1g18AoWf0yPrgTd9qhFCHtsD6RsfqenzcXZq+k8CsznZhhQBDR6\n\tiO1ec4R3bojvSCn4e6nULfCuZInvo/4DQ3aH2LvX5TDtOLZD2glqcEh273DG9KM5yx\n\t0IlsJsjSAOq8xeMuAU3uSFCVq9V9QKePlFQm1tXI=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 6 Feb 2019 08:08:16 +0200", "Message-Id": "<20190206060818.13907-26-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190206060818.13907-1-laurent.pinchart@ideasonboard.com>", "References": "<20190206060818.13907-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 25/27] cam: Add capture operation", "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": "Wed, 06 Feb 2019 06:08:30 -0000" }, "content": "From: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nAdd an option to capture frames from a camera and keep it running until\nthe user terminates by sending SIGINT.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/main.cpp | 141 +++++++++++++++++++++++++++++++++++++----------\n 1 file changed, 111 insertions(+), 30 deletions(-)", "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 06f9e6e16e87..ec5040e19935 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -5,6 +5,7 @@\n * main.cpp - cam - The libcamera swiss army knife\n */\n \n+#include <iomanip>\n #include <iostream>\n #include <map>\n #include <signal.h>\n@@ -18,16 +19,17 @@\n using namespace libcamera;\n \n OptionsParser::Options options;\n+std::shared_ptr<Camera> camera;\n+EventLoop *loop;\n \n enum {\n \tOptCamera = 'c',\n+\tOptCapture = 'C',\n \tOptFormat = 'f',\n \tOptHelp = 'h',\n \tOptList = 'l',\n };\n \n-EventLoop *loop;\n-\n void signalHandler(int signal)\n {\n \tstd::cout << \"Exiting\" << std::endl;\n@@ -48,6 +50,8 @@ static int parseOptions(int argc, char *argv[])\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(OptCapture, OptionNone,\n+\t\t\t \"Capture until interrupted by user\", \"capture\");\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@@ -66,30 +70,25 @@ static int parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n-bool configureStreams(Camera *camera, std::vector<Stream *> &streams)\n+static bool configureStreams(Camera *camera, std::vector<Stream *> &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<Stream *, StreamConfiguration> config =\n \t\tcamera->streamConfiguration(streams);\n \n-\tif (format.isSet(\"width\"))\n-\t\tconfig[id].width = format[\"width\"];\n+\tif (options.isSet(OptFormat)) {\n+\t\tif (format.isSet(\"width\"))\n+\t\t\tconfig[id].width = format[\"width\"];\n \n-\tif (format.isSet(\"height\"))\n-\t\tconfig[id].height = format[\"height\"];\n+\t\tif (format.isSet(\"height\"))\n+\t\t\tconfig[id].height = format[\"height\"];\n \n-\t/* TODO: Translate 4CC string to ID. */\n-\tif (format.isSet(\"pixelformat\"))\n-\t\tconfig[id].pixelFormat = format[\"pixelformat\"];\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}\n \n \tif (camera->configureStreams(config))\n \t\treturn false;\n@@ -97,6 +96,89 @@ bool configureStreams(Camera *camera, std::vector<Stream *> &streams)\n \treturn true;\n }\n \n+static void requestComplete(Request *request, const std::map<Stream *, Buffer *> &buffers)\n+{\n+\tstatic uint64_t last = 0;\n+\n+\tBuffer *buffer = buffers.begin()->second;\n+\n+\tdouble fps = buffer->timestamp() - last;\n+\tfps = last && fps ? 1000000000.0 / fps : 0.0;\n+\tlast = buffer->timestamp();\n+\n+\tstd::cout << \"seq: \" << std::setw(6) << std::setfill('0') << buffer->sequence()\n+\t\t << \" buf: \" << buffer->index()\n+\t\t << \" bytesused: \" << buffer->bytesused()\n+\t\t << \" timestamp: \" << buffer->timestamp()\n+\t\t << \" fps: \" << std::fixed << std::setprecision(2) << fps\n+\t\t << std::endl;\n+\n+\trequest = camera->createRequest();\n+\tif (!request) {\n+\t\tstd::cerr << \"Can't create request\" << std::endl;\n+\t\treturn;\n+\t}\n+\n+\trequest->setBuffers(buffers);\n+\tcamera->queueRequest(request);\n+}\n+\n+static int capture()\n+{\n+\tint ret;\n+\n+\tstd::vector<Stream *> streams = camera->streams();\n+\n+\tret = configureStreams(camera.get(), streams);\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.front();\n+\n+\tret = camera->allocateBuffers();\n+\tif (ret) {\n+\t\tstd::cerr << \"Failed to allocate buffers\"\n+\t\t\t << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\tcamera->requestCompleted.connect(requestComplete);\n+\n+\tBufferPool &pool = stream->bufferPool();\n+\n+\tfor (Buffer &buffer : pool.buffers()) {\n+\t\tRequest *request = camera->createRequest();\n+\t\tif (!request) {\n+\t\t\tstd::cerr << \"Can't create request\" << std::endl;\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\n+\t\tstd::map<Stream *, Buffer *> map;\n+\t\tmap[stream] = &buffer;\n+\t\tret = request->setBuffers(map);\n+\t\tif (ret < 0) {\n+\t\t\tstd::cerr << \"Can't set buffers for request\" << std::endl;\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\tret = camera->queueRequest(request);\n+\t\tif (ret < 0) {\n+\t\t\tstd::cerr << \"Can't queue request\" << std::endl;\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\tstd::cout << \"Capture until user interrupts by SIGINT\" << std::endl;\n+\tcamera->start();\n+\n+\tret = loop->exec();\n+\n+\tcamera->stop();\n+\treturn ret;\n+}\n+\n int main(int argc, char **argv)\n {\n \tint ret;\n@@ -106,8 +188,6 @@ int main(int argc, char **argv)\n \t\treturn EXIT_FAILURE;\n \n \tCameraManager *cm = CameraManager::instance();\n-\tstd::shared_ptr<Camera> camera;\n-\tstd::vector<Stream *> streams;\n \n \tret = cm->start();\n \tif (ret) {\n@@ -136,7 +216,13 @@ int main(int argc, char **argv)\n \t\t\tgoto out;\n \t\t}\n \n-\t\tstreams = camera->streams();\n+\t\tconst std::vector<Stream *> &streams = camera->streams();\n+\t\tif (streams.size() != 1) {\n+\t\t\tstd::cout << \"Camera has \" << streams.size()\n+\t\t\t\t << \" streams, only 1 is supported\"\n+\t\t\t\t << std::endl;\n+\t\t\tgoto out;\n+\t\t}\n \n \t\tif (camera->acquire()) {\n \t\t\tstd::cout << \"Failed to acquire camera\" << std::endl;\n@@ -146,22 +232,17 @@ int main(int argc, char **argv)\n \t\tstd::cout << \"Using camera \" << camera->name() << std::endl;\n \t}\n \n-\tif (options.isSet(OptFormat)) {\n+\tif (options.isSet(OptCapture)) {\n \t\tif (!camera) {\n-\t\t\tstd::cout << \"Can't configure stream, no camera selected\"\n+\t\t\tstd::cout << \"Can't capture without a camera\"\n \t\t\t\t << std::endl;\n-\t\t\tgoto out_camera;\n+\t\t\tret = EXIT_FAILURE;\n+\t\t\tgoto out;\n \t\t}\n \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\tcapture();\n \t}\n \n-\tret = loop->exec();\n-\n-out_camera:\n \tif (camera) {\n \t\tcamera->release();\n \t\tcamera.reset();\n", "prefixes": [ "libcamera-devel", "25/27" ] }