Patch Detail

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

{
    "id": 427,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/427/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/427/",
    "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": "<20190128004109.25860-7-niklas.soderlund@ragnatech.se>",
    "date": "2019-01-28T00:41:09",
    "name": "[libcamera-devel,6/6] cam: add --format option to configure a stream",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "9f13b84a388febf55255bb2107112424caa832e2",
    "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/427/mbox/",
    "series": [
        {
            "id": 149,
            "url": "https://patchwork.libcamera.org/api/1.1/series/149/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=149",
            "date": "2019-01-28T00:41:03",
            "name": "cam: add --format option to configure a stream",
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/149/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/427/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/427/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<niklas.soderlund@ragnatech.se>",
        "Received": [
            "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 43ADF60DC8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 28 Jan 2019 01:41:35 +0100 (CET)",
            "from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 68e82fd3-2295-11e9-911a-0050569116f7;\n\tMon, 28 Jan 2019 01:41:11 +0100 (CET)"
        ],
        "X-Halon-ID": "68e82fd3-2295-11e9-911a-0050569116f7",
        "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, 28 Jan 2019 01:41:09 +0100",
        "Message-Id": "<20190128004109.25860-7-niklas.soderlund@ragnatech.se>",
        "X-Mailer": "git-send-email 2.20.1",
        "In-Reply-To": "<20190128004109.25860-1-niklas.soderlund@ragnatech.se>",
        "References": "<20190128004109.25860-1-niklas.soderlund@ragnatech.se>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=UTF-8",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH 6/6] cam: add --format option to configure\n\ta 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, 28 Jan 2019 00:41:35 -0000"
    },
    "content": "Add a 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>\n---\n src/cam/main.cpp | 104 +++++++++++++++++++++++++++++++++++++++++------\n 1 file changed, 92 insertions(+), 12 deletions(-)",
    "diff": "diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex bde47a8f17983912..4b4ce9aa29c80bd1 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -20,7 +20,8 @@ using namespace libcamera;\n OptionsParser::Options options;\n \n enum {\n-\tOptCamera = 'c',\n+\tOptCamera = 'C',\n+\tOptFormat = 'f',\n \tOptHelp = 'h',\n \tOptList = 'l',\n };\n@@ -35,10 +36,20 @@ void signalHandler(int signal)\n \n static int parseOptions(int argc, char *argv[])\n {\n+\tKeyValueParser formatKeyValue;\n+\tformatKeyValue.addOption(\"width\", \"Set width in pixels\",\n+\t\t\t\t ArgumentRequired, \"w\");\n+\tformatKeyValue.addOption(\"height\", \"Set height in pixels\",\n+\t\t\t\t ArgumentRequired, \"h\");\n+\tformatKeyValue.addOption(\"pixelformat\", \"Set pixel format\",\n+\t\t\t\t ArgumentRequired, \"pf\");\n+\n \tOptionsParser parser;\n \n \tparser.addOption(OptCamera, \"Specify which camera to operate on\",\n \t\t\t \"camera\", ArgumentRequired, \"camera\");\n+\tparser.addOption(OptFormat, \"Set format of the cameras first stream\",\n+\t\t\t formatKeyValue, \"format\");\n \tparser.addOption(OptHelp, \"Display this help message\", \"help\");\n \tparser.addOption(OptList, \"List all cameras\", \"list\");\n \n@@ -54,6 +65,42 @@ static int parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n+int str2uint(std::string str, unsigned int *dest)\n+{\n+\tif (!dest || str == \"\" || !sscanf(str.c_str(), \"%d\", dest))\n+\t\treturn -EINVAL;\n+\treturn 0;\n+}\n+\n+bool configureStreams(Camera *camera, std::vector<Stream> &streams)\n+{\n+\tif (!options.isKeyValue(OptFormat))\n+\t\treturn false;\n+\n+\tKeyValueParser::Options format = options.keyValues(OptFormat);\n+\n+\tstd::map<unsigned int, StreamConfiguration> config = camera->streamConfiguration(streams);\n+\tunsigned int id = streams.front().id();\n+\n+\tif (format.isSet(\"width\"))\n+\t\tif (str2uint(format[\"width\"], &config[id].width))\n+\t\t\treturn false;\n+\n+\tif (format.isSet(\"height\"))\n+\t\tif (str2uint(format[\"height\"], &config[id].height))\n+\t\t\treturn false;\n+\n+\t/* TODO: Translate 4CC string to ID. */\n+\tif (format.isSet(\"pixelformat\"))\n+\t\tif (str2uint(format[\"pixelformat\"], &config[id].pixelFormat))\n+\t\t\treturn false;\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@@ -63,6 +110,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@@ -71,31 +120,62 @@ 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+\t\tif (streams.size() != 1) {\n+\t\t\tstd::cout << \"Camera have \" << streams.size()\n+\t\t\t\t  << \" streams, I only know how to work with 1\"\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+\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\" << 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",
        "6/6"
    ]
}