Patch Detail
Show a patch.
GET /api/patches/3819/?format=api
{ "id": 3819, "url": "https://patchwork.libcamera.org/api/patches/3819/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3819/", "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": "<20200519032505.17307-9-laurent.pinchart@ideasonboard.com>", "date": "2020-05-19T03:25:05", "name": "[libcamera-devel,8/8] cam: Add support for viewfinder through DRM/KMS", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "829aa9e2b974a329272c33fbea5ffa2daae21040", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": { "id": 14, "url": "https://patchwork.libcamera.org/api/users/14/?format=api", "username": "pinchartl", "first_name": "Laurent", "last_name": "Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/3819/mbox/", "series": [ { "id": 912, "url": "https://patchwork.libcamera.org/api/series/912/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=912", "date": "2020-05-19T03:24:57", "name": "libcamera: Add DRM/KMS viewfinder display to cam", "version": 1, "mbox": "https://patchwork.libcamera.org/series/912/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3819/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3819/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 776AF603D6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:21 +0200 (CEST)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1F232A1D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:21 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"e5xcoQxI\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589858721;\n\tbh=llEFdOHZMlyTyvwrTy2Iz0NNyRtg8yxj4chub2uUds4=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=e5xcoQxIbu//oIJTFm4xazYNbeo71XpEgxI3mM7FzrBDJ5XQOLiSZPzknL7ILl/BQ\n\tntF69DUIqw1Qs4HSFEI1xhbOD1ROmGlkgSsgsBkzzrYNFTzi4li2bixx4i2JrHXk8q\n\tC0FNkqZbBHvK3coyGdCYBN/pJ0D6YUZOJ7KqARvk=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 19 May 2020 06:25:05 +0300", "Message-Id": "<20200519032505.17307-9-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "References": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 8/8] cam: Add support for viewfinder\n\tthrough DRM/KMS", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "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": "Tue, 19 May 2020 03:25:22 -0000" }, "content": "Use the KMSSink class to display the viewfinder stream, if any, through\nDRM/KMS. The output connector is selected through the new -D/--display\nargument.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/capture.cpp | 21 +++++++++++++++++++++\n src/cam/main.cpp | 11 +++++++++++\n src/cam/main.h | 1 +\n 3 files changed, 33 insertions(+)", "diff": "diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex 6982d89fabe7..5b25b2c239f8 100644\n--- a/src/cam/capture.cpp\n+++ b/src/cam/capture.cpp\n@@ -13,6 +13,9 @@\n \n #include \"capture.h\"\n #include \"file_sink.h\"\n+#ifdef HAVE_KMS\n+#include \"kms_sink.h\"\n+#endif\n #include \"main.h\"\n \n using namespace libcamera;\n@@ -46,6 +49,24 @@ int Capture::run(EventLoop *loop, const OptionsParser::Options &options)\n \n \tcamera_->requestCompleted.connect(this, &Capture::requestComplete);\n \n+#ifdef HAVE_KMS\n+\tif (options.isSet(OptDisplay)) {\n+\t\tif (config_->size() != 1) {\n+\t\t\tstd::cout << \"Display doesn't support multiple streams\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tif (roles_[0] != StreamRole::Viewfinder) {\n+\t\t\tstd::cout << \"Display requires a viewfinder stream\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tsink_ = new KMSSink(options[OptDisplay].toString());\n+\t}\n+#endif\n+\n \tif (options.isSet(OptFile)) {\n \t\tif (!options[OptFile].toString().empty())\n \t\t\tsink_ = new FileSink(options[OptFile]);\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex cdd29d500202..5cd1e929bd88 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -78,6 +78,12 @@ int CamApp::init(int argc, char **argv)\n \tif (ret < 0)\n \t\treturn ret;\n \n+\tif (options_.isSet(OptDisplay) && options_.isSet(OptFile)) {\n+\t\tstd::cout << \"--display and --file options are mutually exclusive\"\n+\t\t\t << std::endl;\n+\t\treturn -EINVAL;\n+\t}\n+\n \tcm_ = new CameraManager();\n \n \tret = cm_->start();\n@@ -164,6 +170,11 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t ArgumentRequired, \"camera\");\n \tparser.addOption(OptCapture, OptionNone,\n \t\t\t \"Capture until interrupted by user\", \"capture\");\n+#ifdef HAVE_KMS\n+\tparser.addOption(OptDisplay, OptionString,\n+\t\t\t \"Display viewfinder through DRM/KMS on specified connector\",\n+\t\t\t \"display\", ArgumentOptional, \"connector\");\n+#endif\n \tparser.addOption(OptFile, OptionString,\n \t\t\t \"Write captured frames to disk\\n\"\n \t\t\t \"The first '#' character in the file name is expanded to the stream name and frame sequence number.\\n\"\ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex 4a130d8dd290..57eece507a16 100644\n--- a/src/cam/main.h\n+++ b/src/cam/main.h\n@@ -10,6 +10,7 @@\n enum {\n \tOptCamera = 'c',\n \tOptCapture = 'C',\n+\tOptDisplay = 'D',\n \tOptFile = 'F',\n \tOptHelp = 'h',\n \tOptInfo = 'I',\n", "prefixes": [ "libcamera-devel", "8/8" ] }