{"id":13202,"url":"https://patchwork.libcamera.org/api/patches/13202/?format=json","web_url":"https://patchwork.libcamera.org/patch/13202/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210804124314.8044-9-laurent.pinchart@ideasonboard.com>","date":"2021-08-04T12:43:14","name":"[libcamera-devel,v3,8/8] cam: Add support for viewfinder through DRM/KMS","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4f4d3d8b95fe819d3bac3e62fff0aa2bd818d884","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13202/mbox/","series":[{"id":2303,"url":"https://patchwork.libcamera.org/api/series/2303/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2303","date":"2021-08-04T12:43:06","name":"libcamera: Add DRM/KMS viewfinder display to cam","version":3,"mbox":"https://patchwork.libcamera.org/series/2303/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13202/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13202/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 46D33C323A\n\tfor ;\n\tWed, 4 Aug 2021 12:43:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 62B0568822;\n\tWed, 4 Aug 2021 14:43:37 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 914BD6880F\n\tfor ;\n\tWed, 4 Aug 2021 14:43:32 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2FE5924F\n\tfor ;\n\tWed, 4 Aug 2021 14:43:32 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"gvBmz8P2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628081012;\n\tbh=ejIfo7arl18wTGGZFQZHf5jQUpwRp/KPZAjU2qhMDjM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=gvBmz8P2PiuKz7rgh5YzA3SjUy6GxldmQ59jnBoz+aeD6039wnw2TOo8JLMbPuy3z\n\tNVthPYunsOPM9x/wVrDMBhah1Pph+nTCWK9PnImxI3ddWmD/Cw5AaR/jHZZuM64DEy\n\teRbJ+FeNrTeqR+FjvF6NGeMRlbEPR321qlZMfTXA=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 4 Aug 2021 15:43:14 +0300","Message-Id":"<20210804124314.8044-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210804124314.8044-1-laurent.pinchart@ideasonboard.com>","References":"<20210804124314.8044-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \nReviewed-by: Paul Elder \n---\nChanges since v2:\n\n- Add compile guard around option check\n\nChanges since v1:\n\n- Validate display option in CamApp::init()\n---\n src/cam/camera_session.cpp | 30 ++++++++++++++++++++++++++++++\n src/cam/main.cpp | 6 ++++++\n src/cam/main.h | 1 +\n 3 files changed, 37 insertions(+)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex f34a6ed55ad7..60d640f2b15c 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -16,6 +16,9 @@\n #include \"camera_session.h\"\n #include \"event_loop.h\"\n #include \"file_sink.h\"\n+#ifdef HAVE_KMS\n+#include \"kms_sink.h\"\n+#endif\n #include \"main.h\"\n #include \"stream_options.h\"\n \n@@ -66,6 +69,28 @@ CameraSession::CameraSession(CameraManager *cm,\n \n \tbool strictFormats = options_.isSet(OptStrictFormats);\n \n+#ifdef HAVE_KMS\n+\tif (options_.isSet(OptDisplay)) {\n+\t\tif (options_.isSet(OptFile)) {\n+\t\t\tstd::cerr << \"--display and --file options are mutually exclusive\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tif (roles.size() != 1) {\n+\t\t\tstd::cerr << \"Display doesn't support multiple streams\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tif (roles[0] != StreamRole::Viewfinder) {\n+\t\t\tstd::cerr << \"Display requires a viewfinder stream\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn;\n+\t\t}\n+\t}\n+#endif\n+\n \tswitch (config->validate()) {\n \tcase CameraConfiguration::Valid:\n \t\tbreak;\n@@ -161,6 +186,11 @@ int CameraSession::start()\n \n \tcamera_->requestCompleted.connect(this, &CameraSession::requestComplete);\n \n+#ifdef HAVE_KMS\n+\tif (options_.isSet(OptDisplay))\n+\t\tsink_ = std::make_unique(options_[OptDisplay].toString());\n+#endif\n+\n \tif (options_.isSet(OptFile)) {\n \t\tif (!options_[OptFile].toString().empty())\n \t\t\tsink_ = std::make_unique(options_[OptFile]);\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 34cbc3229563..c7f664b903e0 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -132,6 +132,12 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t \"Capture until interrupted by user or until frames captured\",\n \t\t\t \"capture\", ArgumentOptional, \"count\", false,\n \t\t\t OptCamera);\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\", false,\n+\t\t\t OptCamera);\n+#endif\n \tparser.addOption(OptFile, OptionString,\n \t\t\t \"Write captured frames to disk\\n\"\n \t\t\t \"If the file name ends with a '/', it sets the directory in which\\n\"\ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex d22451f59817..1c2fab763698 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","v3","8/8"]}