Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 469,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/469/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/469/",
    "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": "<20190131235151.22833-1-laurent.pinchart@ideasonboard.com>",
    "date": "2019-01-31T23:51:51",
    "name": "[libcamera-devel,v2.1,8/8] cam: Add --format option to configure a stream",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "35767696ce703ba28fdeae04634d30e0ef954a10",
    "submitter": {
        "id": 2,
        "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api",
        "name": "Laurent Pinchart",
        "email": "laurent.pinchart@ideasonboard.com"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/469/mbox/",
    "series": [
        {
            "id": 159,
            "url": "https://patchwork.libcamera.org/api/1.1/series/159/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=159",
            "date": "2019-01-31T23:51:51",
            "name": null,
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/159/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/469/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/469/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 1E56260DB4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  1 Feb 2019 00:51:59 +0100 (CET)",
            "from pendragon.ideasonboard.com (85-76-34-136-nat.elisa-mobile.fi\n\t[85.76.34.136])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A40AF41;\n\tFri,  1 Feb 2019 00:51:57 +0100 (CET)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548978718;\n\tbh=u+SFvPnLy1SJPtoxdBaSAHl8K46TR67NFgN/n6A8cHM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=bbEAkGPpKJlIWvRfDEOZIFzeEgXneIu1HgTFdWQ/0iRnUfZ4Q5PkSU+/dbegLvPfa\n\tXBIlMMjWFIpRxNUvjUqVvzy5hZ2nzyPtY0eGKGDOntLh/4oZc0aZ6uH409uNZr4AXC\n\t6yCdhTSZAL/V+ZgWKsjAXJeNlLe2//FDNZA0q0lo=",
        "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Fri,  1 Feb 2019 01:51:51 +0200",
        "Message-Id": "<20190131235151.22833-1-laurent.pinchart@ideasonboard.com>",
        "X-Mailer": "git-send-email 2.19.2",
        "In-Reply-To": "<20190131234721.22606-9-laurent.pinchart@ideasonboard.com>",
        "References": "<20190131234721.22606-9-laurent.pinchart@ideasonboard.com>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=UTF-8",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH v2.1 8/8] cam: Add --format option to\n\tconfigure a 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": "Thu, 31 Jan 2019 23:51:59 -0000"
    },
    "content": "From: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nAdd an option to configure the first stream of a camera from an argument\nwith options and parse the width, height and pixel format from that\nlist.\n\nThe pixel format is still specified as a integer which should correspond\nto the kernels FOURCC identifiers. Going forward this should be turned\ninto a string representation and the cam parser should translate between\nthe two.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\nChanges since v2:\n\n- Drop str2uint()\n\nChanges since v1:\n\n- Don't rename OptCamera option\n- Reword the format options help texts\n- Use the new KeyValueParser integration\n---\n src/cam/main.cpp | 93 +++++++++++++++++++++++++++++++++++++++++-------\n 1 file changed, 81 insertions(+), 12 deletions(-)",
    "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 7934d0bf4132..06f9e6e16e87 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -21,6 +21,7 @@ OptionsParser::Options options;\n \n enum {\n \tOptCamera = 'c',\n+\tOptFormat = 'f',\n \tOptHelp = 'h',\n \tOptList = 'l',\n };\n@@ -35,11 +36,20 @@ void signalHandler(int signal)\n \n static int parseOptions(int argc, char *argv[])\n {\n-\tOptionsParser parser;\n+\tKeyValueParser formatKeyValue;\n+\tformatKeyValue.addOption(\"width\", OptionInteger, \"Width in pixels\",\n+\t\t\t\t ArgumentRequired);\n+\tformatKeyValue.addOption(\"height\", OptionInteger, \"Height in pixels\",\n+\t\t\t\t ArgumentRequired);\n+\tformatKeyValue.addOption(\"pixelformat\", OptionInteger, \"Pixel format\",\n+\t\t\t\t ArgumentRequired);\n \n+\tOptionsParser parser;\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(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 \t\t\t \"help\");\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n@@ -56,6 +66,37 @@ static int parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n+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+\n+\tif (format.isSet(\"height\"))\n+\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+\n+\tif (camera->configureStreams(config))\n+\t\treturn false;\n+\n+\treturn true;\n+}\n+\n int main(int argc, char **argv)\n {\n \tint ret;\n@@ -65,6 +106,8 @@ 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@@ -73,31 +116,57 @@ int main(int argc, char **argv)\n \t\treturn EXIT_FAILURE;\n \t}\n \n+\tloop = new EventLoop(cm->eventDispatcher());\n+\n+\tstruct sigaction sa = {};\n+\tsa.sa_handler = &signalHandler;\n+\tsigaction(SIGINT, &sa, nullptr);\n+\n \tif (options.isSet(OptList)) {\n \t\tstd::cout << \"Available cameras:\" << std::endl;\n-\t\tfor (const std::shared_ptr<Camera> &camera : cm->cameras())\n-\t\t\tstd::cout << \"- \" << camera->name() << std::endl;\n+\t\tfor (const std::shared_ptr<Camera> &cam : cm->cameras())\n+\t\t\tstd::cout << \"- \" << cam->name() << std::endl;\n \t}\n \n \tif (options.isSet(OptCamera)) {\n-\t\tstd::shared_ptr<Camera> cam = cm->get(options[OptCamera]);\n-\n-\t\tif (cam) {\n-\t\t\tstd::cout << \"Using camera \" << cam->name() << std::endl;\n-\t\t} else {\n+\t\tcamera = cm->get(options[OptCamera]);\n+\t\tif (!camera) {\n \t\t\tstd::cout << \"Camera \" << options[OptCamera]\n \t\t\t\t  << \" not found\" << std::endl;\n+\t\t\tgoto out;\n \t\t}\n+\n+\t\tstreams = camera->streams();\n+\n+\t\tif (camera->acquire()) {\n+\t\t\tstd::cout << \"Failed to acquire camera\" << std::endl;\n+\t\t\tgoto out;\n+\t\t}\n+\n+\t\tstd::cout << \"Using camera \" << camera->name() << std::endl;\n \t}\n \n-\tloop = new EventLoop(cm->eventDispatcher());\n+\tif (options.isSet(OptFormat)) {\n+\t\tif (!camera) {\n+\t\t\tstd::cout << \"Can't configure stream, no camera selected\"\n+\t\t\t\t  << std::endl;\n+\t\t\tgoto out_camera;\n+\t\t}\n \n-\tstruct sigaction sa = {};\n-\tsa.sa_handler = &signalHandler;\n-\tsigaction(SIGINT, &sa, nullptr);\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}\n \n \tret = loop->exec();\n \n+out_camera:\n+\tif (camera) {\n+\t\tcamera->release();\n+\t\tcamera.reset();\n+\t}\n+out:\n \tdelete loop;\n \n \tcm->stop();\n",
    "prefixes": [
        "libcamera-devel",
        "v2.1",
        "8/8"
    ]
}