[{"id":4843,"web_url":"https://patchwork.libcamera.org/comment/4843/","msgid":"","date":"2020-05-19T08:35:59","subject":"Re: [libcamera-devel] [PATCH 8/8] cam: Add support for viewfinder\n\tthrough DRM/KMS","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 19/05/2020 04:25, Laurent Pinchart wrote:\n> Use the KMSSink class to display the viewfinder stream, if any, through\n> DRM/KMS. The output connector is selected through the new -D/--display\n> argument.\n\nFantastic. Live previewing from non-GUI system is really helpful.\n\n\n> Signed-off-by: Laurent Pinchart \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(+)\n> \n> diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\n> index 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\nWhere is this defined?\nShould there be an addition to meson.build?\n\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\nCould we avoid ifdefs if we define a c-like macro in kms_sink.h to\nretain compile time checks?\n\n> +\tif (options.isSet(OptDisplay)) {\n\nSo we get something like:\n\tif (options.isSet(OptDisplay) && have_kms()) {\n\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]);\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 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\nIs this a performance restriction? Or because we can only have one\nFrameSink currently.\n\nI mean we don't necessarily want to be writing lots (thousands) of RAW\nframes while a display is running, but *viewing* the 'N<20' raw frames\nwhile they are being captured to disk is useful (to see them live before\nyou further inspect the files).\n\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\"\n> diff --git a/src/cam/main.h b/src/cam/main.h\n> index 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>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EDE63603D8\n\tfor ;\n\tTue, 19 May 2020 10:36:02 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E395D30C;\n\tTue, 19 May 2020 10:36:01 +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=\"ZQiAYgE1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589877362;\n\tbh=y1/D7Bu0lU/R9HrAn5anNttnegOO0lDFI3H5hjbaz64=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=ZQiAYgE1VeyhhtcSaAOYT5vIo6+0mhMDkfsWK8HCJuJq8heFHWQhW9zk5PoSwPGI2\n\tCQCKAiCNZ0IV9sEeoidF5QY5LKY1W6LCUSVWOW04bhp5aBn2RS9Kk28Jj/2Pd35Gpk\n\tNH7nSBlXd0mXg0CicyD7GQNfQqS8/Vhi2XkPfjho=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>\n\t<20200519032505.17307-9-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Tue, 19 May 2020 09:35:59 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200519032505.17307-9-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 19 May 2020 08:36:03 -0000"}},{"id":4847,"web_url":"https://patchwork.libcamera.org/comment/4847/","msgid":"<20200519110657.GA3820@pendragon.ideasonboard.com>","date":"2020-05-19T11:06:57","subject":"Re: [libcamera-devel] [PATCH 8/8] cam: Add support for viewfinder\n\tthrough DRM/KMS","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Tue, May 19, 2020 at 09:35:59AM +0100, Kieran Bingham wrote:\n> Hi Laurent,\n> \n> On 19/05/2020 04:25, Laurent Pinchart wrote:\n> > Use the KMSSink class to display the viewfinder stream, if any, through\n> > DRM/KMS. The output connector is selected through the new -D/--display\n> > argument.\n> \n> Fantastic. Live previewing from non-GUI system is really helpful.\n> \n> > Signed-off-by: Laurent Pinchart \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(+)\n> > \n> > diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\n> > index 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> \n> Where is this defined?\n> Should there be an addition to meson.build?\n\nIn patch 5/8.\n\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> \n> Could we avoid ifdefs if we define a c-like macro in kms_sink.h to\n> retain compile time checks?\n> \n> > +\tif (options.isSet(OptDisplay)) {\n> \n> So we get something like:\n> \tif (options.isSet(OptDisplay) && have_kms()) {\n\nExcept that we would link against the KMSSink class API, even if we\nnever call it, resulting in link errors. To work around that we could\nhave a dummy implementation when !HAVE_KMS, but we would then test the\ndummy implementation, not the real one. Its API may differ slightly (it\nshouldn't of course, but mistakes happen), so I'm not sure it really\ngives us much.\n\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]);\n> > diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> > index 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> \n> Is this a performance restriction? Or because we can only have one\n> FrameSink currently.\n\nThe latter. This can be extended of course, but I wanted to start\nsimple.\n\n> I mean we don't necessarily want to be writing lots (thousands) of RAW\n> frames while a display is running, but *viewing* the 'N<20' raw frames\n> while they are being captured to disk is useful (to see them live before\n> you further inspect the files).\n\nAnd even capture frames when pressing enter. Possibilities are endless\n;-) I'm sure this can be done, but I'd prefer doing it on top of this\nseries.\n\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\"\n> > diff --git a/src/cam/main.h b/src/cam/main.h\n> > index 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',","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DB322603D9\n\tfor ;\n\tTue, 19 May 2020 13:07:09 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DFA0230C;\n\tTue, 19 May 2020 13:07:08 +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=\"AmId1MYX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589886429;\n\tbh=Im/zizBRar7liZbFts50qJP5tb0TRI6WNUIE6PU5CrM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=AmId1MYX4joj7Crp6Fq8y3504k9y9HSMD2dvqI7W9O4apoeqLrt/f2feNZJfvwA3v\n\t6EBcYbTF2C8tWWW4KIE+k/aSD6lK88SZ1rJb1U45psjCaWOIa9+Pl0KRCIxUVR0qPf\n\tWQDAch9sJLmlZ38wL1H5pd9vfPTzlF7A9IKsFWIE=","Date":"Tue, 19 May 2020 14:06:57 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200519110657.GA3820@pendragon.ideasonboard.com>","References":"<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>\n\t<20200519032505.17307-9-laurent.pinchart@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 19 May 2020 11:07:10 -0000"}}]