{"id":1260,"url":"https://patchwork.libcamera.org/api/patches/1260/?format=json","web_url":"https://patchwork.libcamera.org/patch/1260/","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":"<20190522210220.1631-6-paul.elder@ideasonboard.com>","date":"2019-05-22T21:02:20","name":"[libcamera-devel,RFC,5/5] libcamera: pipelines: add IPAManager","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"51cf3871462ff1182789a148548524dbe25eb6bd","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1260/mbox/","series":[{"id":317,"url":"https://patchwork.libcamera.org/api/series/317/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=317","date":"2019-05-22T21:02:15","name":"Add IPAManager","version":1,"mbox":"https://patchwork.libcamera.org/series/317/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1260/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1260/checks/","tags":{},"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 ECCDC61867\n\tfor ;\n\tWed, 22 May 2019 23:02:42 +0200 (CEST)","from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 36C3EBB0;\n\tWed, 22 May 2019 23:02:42 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558558962;\n\tbh=VsE7t7sIFFzaxwZ6yNKbnfIn1efX+h5TkSSBpYuXvrQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=PHsfBlR8dQFWiI1ZVCU6oBBjXIT5hJU27BDajOyTWRFUpvH9riqtZ6FFl3FKTxbHe\n\tuynySzdH5GOBU+bn9Breu61Y0SeJLRqLR1AM9JQL32VKF/+VpZ2/BGFJC4b25Y15Ei\n\tiJp9HrDUjBTsX4+497xQrREfxNafjGdobXcxei0A=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 22 May 2019 17:02:20 -0400","Message-Id":"<20190522210220.1631-6-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190522210220.1631-1-paul.elder@ideasonboard.com>","References":"<20190522210220.1631-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH 5/5] libcamera: pipelines: add\n\tIPAManager","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 22 May 2019 21:02:43 -0000"},"content":"The pipeline handlers must be able to query the IPAManager (unique\npointer, similar to DeviceEnumerator) for an IPA module. Change the\nPipelineHandler::match() method to accept an IPAManager, and make the\nUVC pipeline query for one of the test IPA modules.\n\nSigned-off-by: Paul Elder \n---\n src/libcamera/camera_manager.cpp | 8 +++++++-\n src/libcamera/include/pipeline_handler.h | 3 ++-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +++--\n src/libcamera/pipeline/uvcvideo.cpp | 18 +++++++++++++++---\n src/libcamera/pipeline/vimc.cpp | 4 ++--\n 6 files changed, 32 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex cf881ce..b896e93 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -12,6 +12,7 @@\n \n #include \"device_enumerator.h\"\n #include \"event_dispatcher_poll.h\"\n+#include \"ipa_manager.h\"\n #include \"log.h\"\n #include \"pipeline_handler.h\"\n #include \"utils.h\"\n@@ -83,6 +84,11 @@ int CameraManager::start()\n \tif (!enumerator_ || enumerator_->enumerate())\n \t\treturn -ENODEV;\n \n+\tstd::unique_ptr ipaManager = IPAManager::create();\n+\tif (!ipaManager)\n+\t\treturn -ENODEV;\n+\tipaManager->addDir(\"test/ipa\");\n+\n \t/*\n \t * TODO: Try to read handlers and order from configuration\n \t * file and only fallback on all handlers if there is no\n@@ -97,7 +103,7 @@ int CameraManager::start()\n \t\t */\n \t\twhile (1) {\n \t\t\tstd::shared_ptr pipe = factory->create(this);\n-\t\t\tif (!pipe->match(enumerator_.get()))\n+\t\t\tif (!pipe->match(enumerator_.get(), ipaManager.get()))\n \t\t\t\tbreak;\n \n \t\t\tLOG(Camera, Debug)\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 9f5fe3d..bbc13da 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -23,6 +23,7 @@ class CameraConfiguration;\n class CameraManager;\n class DeviceEnumerator;\n class DeviceMatch;\n+class IPAManager;\n class MediaDevice;\n class PipelineHandler;\n class Request;\n@@ -53,7 +54,7 @@ public:\n \tPipelineHandler(CameraManager *manager);\n \tvirtual ~PipelineHandler();\n \n-\tvirtual bool match(DeviceEnumerator *enumerator) = 0;\n+\tvirtual bool match(DeviceEnumerator *enumerator, IPAManager *ipaManager) = 0;\n \tMediaDevice *acquireMediaDevice(DeviceEnumerator *enumerator,\n \t\t\t\t\tconst DeviceMatch &dm);\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 75a70e6..51593fb 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -18,6 +18,7 @@\n \n #include \"camera_sensor.h\"\n #include \"device_enumerator.h\"\n+#include \"ipa_manager.h\"\n #include \"log.h\"\n #include \"media_device.h\"\n #include \"pipeline_handler.h\"\n@@ -166,7 +167,7 @@ public:\n \n \tint queueRequest(Camera *camera, Request *request) override;\n \n-\tbool match(DeviceEnumerator *enumerator) override;\n+\tbool match(DeviceEnumerator *enumerator, IPAManager *ipaManager) override;\n \n private:\n \tclass IPU3CameraData : public CameraData\n@@ -576,7 +577,7 @@ int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n \treturn error;\n }\n \n-bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n+bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator, IPAManager *ipaManager)\n {\n \tint ret;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 96553bf..2a9aec0 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -17,6 +17,7 @@\n \n #include \"camera_sensor.h\"\n #include \"device_enumerator.h\"\n+#include \"ipa_manager.h\"\n #include \"log.h\"\n #include \"media_device.h\"\n #include \"pipeline_handler.h\"\n@@ -49,7 +50,7 @@ public:\n \n \tint queueRequest(Camera *camera, Request *request) override;\n \n-\tbool match(DeviceEnumerator *enumerator) override;\n+\tbool match(DeviceEnumerator *enumerator, IPAManager *ipaManager) override;\n \n private:\n \tclass RkISP1CameraData : public CameraData\n@@ -337,7 +338,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \treturn 0;\n }\n \n-bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n+bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator, IPAManager *ipaManager)\n {\n \tconst MediaPad *pad;\n \ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 351712c..9c038d0 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -6,16 +6,20 @@\n */\n \n #include \n+#include \n #include \n #include \n \n #include \"device_enumerator.h\"\n+#include \"ipa_manager.h\"\n #include \"log.h\"\n #include \"media_device.h\"\n #include \"pipeline_handler.h\"\n #include \"utils.h\"\n #include \"v4l2_device.h\"\n \n+#include \n+\n namespace libcamera {\n \n LOG_DEFINE_CATEGORY(UVC)\n@@ -41,7 +45,7 @@ public:\n \n \tint queueRequest(Camera *camera, Request *request) override;\n \n-\tbool match(DeviceEnumerator *enumerator) override;\n+\tbool match(DeviceEnumerator *enumerator, IPAManager *ipaManager) override;\n \n private:\n \tclass UVCCameraData : public CameraData\n@@ -166,7 +170,7 @@ int PipelineHandlerUVC::queueRequest(Camera *camera, Request *request)\n \treturn 0;\n }\n \n-bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n+bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator, IPAManager *ipaManager)\n {\n \tMediaDevice *media;\n \tDeviceMatch dm(\"uvcvideo\");\n@@ -175,6 +179,14 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n \tif (!media)\n \t\treturn false;\n \n+\tstruct IPAModuleInfo info;\n+\tinfo.ipaAPIVersion = 1;\n+\tinfo.pipelineVersion = 8999;\n+\tstrcpy(info.pipelineName, \"bleep\");\n+\tconst IPAModule *ipa = ipaManager->acquireIPA(info);\n+\tif (ipa == nullptr)\n+\t\tLOG(UVC, Warning) << \"no matching IPA found\";\n+\n \tstd::unique_ptr data = utils::make_unique(this);\n \n \t/* Locate and open the default video node. */\n@@ -197,7 +209,7 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n \n \t/* Create and register the camera. */\n \tstd::set streams{ &data->stream_ };\n-\tstd::shared_ptr camera = Camera::create(this, media->model(), streams);\n+\tstd::shared_ptr camera = Camera::create(this, media->model() + \" \" + (ipa == nullptr ? \"\" : ipa->info().name), streams);\n \tregisterCamera(std::move(camera), std::move(data));\n \n \t/* Enable hot-unplug notifications. */\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 737d6df..20834aa 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -41,7 +41,7 @@ public:\n \n \tint queueRequest(Camera *camera, Request *request) override;\n \n-\tbool match(DeviceEnumerator *enumerator) override;\n+\tbool match(DeviceEnumerator *enumerator, IPAManager *ipaManager) override;\n \n private:\n \tclass VimcCameraData : public CameraData\n@@ -166,7 +166,7 @@ int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n \treturn 0;\n }\n \n-bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n+bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator, IPAManager *ipaManager)\n {\n \tDeviceMatch dm(\"vimc\");\n \n","prefixes":["libcamera-devel","RFC","5/5"]}