{"id":9137,"url":"https://patchwork.libcamera.org/api/1.1/patches/9137/?format=json","web_url":"https://patchwork.libcamera.org/patch/9137/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200803124823.82691-1-kieran.bingham@ideasonboard.com>","date":"2020-08-03T12:48:23","name":"[libcamera-devel,v3] cam: Add --monitor option","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3a4a9fb56b460e84121a5a4d88e484d572cb7bfd","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9137/mbox/","series":[{"id":1180,"url":"https://patchwork.libcamera.org/api/1.1/series/1180/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1180","date":"2020-08-03T12:48:23","name":"[libcamera-devel,v3] cam: Add --monitor option","version":3,"mbox":"https://patchwork.libcamera.org/series/1180/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9137/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9137/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 C6200BD86F\n\tfor ;\n\tMon, 3 Aug 2020 12:48:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4FB4561826;\n\tMon, 3 Aug 2020 14:48:32 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6265C60536\n\tfor ;\n\tMon, 3 Aug 2020 14:48:30 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 809D6543;\n\tMon, 3 Aug 2020 14:48:29 +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=\"QXcV2IPI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596458909;\n\tbh=sMw1FwRUK3xxaF1nG0k0EsM4hOwf39/FtEvT6FQZJP8=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=QXcV2IPI7ChDO2e3PXTRnrW7Hfjiv8wgAK4UUDHvqfrv8CMPyMmu01DaoIRKB3YRn\n\tu6J+xSljdo6Xf16g7jdxs06puh4J6eRrjw8zroh7sPhl/Vvlnn1hBnzrvJXAuMIFYa\n\tYAQXxjAPLpSe5DogxWDzoGrZGgeirhZ047ATNq2w=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Mon, 3 Aug 2020 13:48:23 +0100","Message-Id":"<20200803124823.82691-1-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3] cam: Add --monitor option","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Umang Jain \n\nAdd --monitor to monitor new hotplug and unplug camera events from\nthe CameraManager.\n\nSigned-off-by: Umang Jain \nReviewed-by: Niklas Söderlund \nReviewed-by: Kieran Bingham \n---\n src/cam/main.cpp | 27 +++++++++++++++++++++++++++\n src/cam/main.h | 1 +\n 2 files changed, 28 insertions(+)\n\nv3:\n - V1 rebased, and slightly modified to update the conditional\n connection of the signals during CamApp::init()\n - Adjust formatting of parser.addOption\n\n\nHi all,\n\nI am aiming to merge Umang's patch, but because I have ended up making a\nmore than superficial change to the code path in CamApp::init() I'm\nreposting as v3. This is essentially v1 of Umangs patch (thanks, and\nsorry for incorrectly leading you to make a v2) with the small line\nadjustment to the parser addition, but a more impacting adjustment to\nthe conditional which enables the signals.\n\n\nIf there are no objections, I can merge this patch.\n\nTesting with the two options combined shows:\n\n./build/src/cam/cam -m -c 1 -C\n\nfps: 25.64 stream0 seq: 000052 bytesused: 36000\nfps: 25.00 stream0 seq: 000053 bytesused: 36024\nfps: 25.00 stream0 seq: 000054 bytesused: 36784\nfps: 25.64 stream0 seq: 000055 bytesused: 36968\nfps: 25.64 stream0 seq: 000056 bytesused: 36792\nfps: 25.00 stream0 seq: 000057 bytesused: 37040\nfps: 25.64 stream0 seq: 000058 bytesused: 36808\nfps: 25.00 stream0 seq: 000059 bytesused: 36848\nfps: 25.00 stream0 seq: 000060 bytesused: 37480\nCamera Removed: VF0520 Live! Cam Sync: VF0520 L\nCamera Added: VF0520 Live! Cam Sync: VF0520 L\nCamera Removed: VF0520 Live! Cam Sync: VF0520 L\n\nSo the stream doesn't continue, but no crashing - so we're fine ;-)\n\n\n--\nKieran","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex f5aba041d7c4..3ceb6576960e 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -36,6 +36,8 @@ public:\n \tvoid quit();\n \n private:\n+\tvoid cameraAdded(std::shared_ptr cam);\n+\tvoid cameraRemoved(std::shared_ptr cam);\n \tint parseOptions(int argc, char *argv[]);\n \tint prepareConfig();\n \tint listControls();\n@@ -123,6 +125,12 @@ int CamApp::init(int argc, char **argv)\n \t\t\treturn ret;\n \t}\n \n+\tif (options_.isSet(OptMonitor)) {\n+\t\tcm_->cameraAdded.connect(this, &CamApp::cameraAdded);\n+\t\tcm_->cameraRemoved.connect(this, &CamApp::cameraRemoved);\n+\t\tstd::cout << \"Monitoring new hotplug and unplug events...\" << std::endl;\n+\t}\n+\n \tloop_ = new EventLoop(cm_->eventDispatcher());\n \n \treturn 0;\n@@ -186,6 +194,9 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t \"list-controls\");\n \tparser.addOption(OptListProperties, OptionNone, \"List cameras properties\",\n \t\t\t \"list-properties\");\n+\tparser.addOption(OptMonitor, OptionNone,\n+\t\t\t \"Monitor for hotplug and unplug camera events\",\n+\t\t\t \"monitor\");\n \tparser.addOption(OptStrictFormats, OptionNone,\n \t\t\t \"Do not allow requested stream format(s) to be adjusted\",\n \t\t\t \"strict-formats\");\n@@ -309,6 +320,16 @@ int CamApp::infoConfiguration()\n \treturn 0;\n }\n \n+void CamApp::cameraAdded(std::shared_ptr cam)\n+{\n+\tstd::cout << \"Camera Added: \" << cam->name() << std::endl;\n+}\n+\n+void CamApp::cameraRemoved(std::shared_ptr cam)\n+{\n+\tstd::cout << \"Camera Removed: \" << cam->name() << std::endl;\n+}\n+\n int CamApp::run()\n {\n \tint ret;\n@@ -346,6 +367,12 @@ int CamApp::run()\n \t\treturn capture.run(options_);\n \t}\n \n+\tif (options_.isSet(OptMonitor)) {\n+\t\tret = loop_->exec();\n+\t\tif (ret)\n+\t\t\tstd::cout << \"Failed to run monitor loop\" << std::endl;\n+\t}\n+\n \treturn 0;\n }\n \ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex 6f95add31a63..ea8dfd330830 100644\n--- a/src/cam/main.h\n+++ b/src/cam/main.h\n@@ -15,6 +15,7 @@ enum {\n \tOptInfo = 'I',\n \tOptList = 'l',\n \tOptListProperties = 'p',\n+\tOptMonitor = 'm',\n \tOptStream = 's',\n \tOptListControls = 256,\n \tOptStrictFormats = 257,\n","prefixes":["libcamera-devel","v3"]}