{"id":11472,"url":"https://patchwork.libcamera.org/api/patches/11472/?format=json","web_url":"https://patchwork.libcamera.org/patch/11472/","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":"<20210302235348.2878-1-laurent.pinchart@ideasonboard.com>","date":"2021-03-02T23:53:48","name":"[libcamera-devel,v2] libcamera: pipeline: simple: Support camera sensors that contain an ISP","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2c8acfb2b741bffbb110ab2eac01fd825d2edf12","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/11472/mbox/","series":[{"id":1747,"url":"https://patchwork.libcamera.org/api/series/1747/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1747","date":"2021-03-02T23:53:48","name":"[libcamera-devel,v2] libcamera: pipeline: simple: Support camera sensors that contain an ISP","version":2,"mbox":"https://patchwork.libcamera.org/series/1747/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11472/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11472/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 A830DBD1F1\n\tfor ;\n\tTue, 2 Mar 2021 23:54:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1DE8568A93;\n\tWed, 3 Mar 2021 00:54:23 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A44A602E8\n\tfor ;\n\tWed, 3 Mar 2021 00:54:20 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E00EF29A\n\tfor ;\n\tWed, 3 Mar 2021 00:54:19 +0100 (CET)"],"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=\"cCE83gyH\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614729260;\n\tbh=GUKTlNiZI/vA0fpo13JNA9kZgdqUSg1SBBN/lKY5Ywg=;\n\th=From:To:Subject:Date:From;\n\tb=cCE83gyHlUtTKLuVjq/6aKuwkVmS8ELvuhk9brBPGS3z42XjMBCS87rqjZ7+OzcdA\n\tj3mKdGHldn4Q36aMU6iDTwVYMr2qBi2xwuaXcVFXSSz24+9NvhQ6yzoPib9D5tEicY\n\tLmk7iXNSFJ3SxJx9VzEArnVC2x/AVWXATywZbKqo=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 3 Mar 2021 01:53:48 +0200","Message-Id":"<20210302235348.2878-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.28.0","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2] libcamera: pipeline: simple: Support\n\tcamera sensors that contain an ISP","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Camera sensors can include an ISP. For instance, the AP1302 external ISP\ncan be connected to up to two raw camera sensors, and the combination of\nthe sensors and ISP is considered as a (smart) camera sensor from\nlibcamera's point of view.\n\nThe CameraSensor class has limited support for this already. Extend the\nsimple pipeline handler to support such sensors, by using the media\nentity corresponding to the ISP instead of the raw camera sensor's\nentity.\n\nWe don't need to handle the case where an entity in the SoC would expose\nthe MEDIA_ENT_F_PROC_VIDEO_ISP function, as pipeline containing an ISP\nwould have a dedicated pipeline handler.\n\nThe implementation is limited as it won't support other multi-entity\ncamera sensors (such as CCS). While this would be worth supporting, we\ndon't have a test platform with a CCS-compatible sensor at this point,\nso let's not over-engineer the solution. Extending support to CCS (and\npossibly other sensor topologies) will likely involve helpers that can\nbe used by other pipeline handlers (such as generic graph walk helpers\nfor instance) and extensions to the CameraSensor class.\n\nSigned-off-by: Laurent Pinchart \n---\nChanges since v1:\n\n- Fix link handling\n---\n src/libcamera/pipeline/simple/simple.cpp | 88 ++++++++++++++++++++----\n 1 file changed, 75 insertions(+), 13 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 36f55e8709f1..aa6155f0596f 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -245,6 +245,8 @@ private:\n \t\t\tPipelineHandler::cameraData(camera));\n \t}\n \n+\tstd::vector locateSensors();\n+\n \tvoid bufferReady(FrameBuffer *buffer);\n \tvoid converterInputDone(FrameBuffer *buffer);\n \tvoid converterOutputDone(FrameBuffer *buffer);\n@@ -869,6 +871,78 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n * Match and Setup\n */\n \n+std::vector SimplePipelineHandler::locateSensors()\n+{\n+\tstd::vector entities;\n+\n+\t/*\n+\t * Gather all the camera sensor entities based on the function they\n+\t * expose.\n+\t */\n+\tfor (MediaEntity *entity : media_->entities()) {\n+\t\tif (entity->function() == MEDIA_ENT_F_CAM_SENSOR)\n+\t\t\tentities.push_back(entity);\n+\t}\n+\n+\tif (entities.empty())\n+\t\treturn {};\n+\n+\t/*\n+\t * Sensors can be made of multiple entities. For instance, a raw sensor\n+\t * can be connected to an ISP, and the combination of both should be\n+\t * treated as one sensor. To support this, as a crude heuristic, check\n+\t * the downstream entity from the camera sensor, and if it is an ISP,\n+\t * use it instead of the sensor.\n+\t */\n+\tstd::vector sensors;\n+\n+\tfor (MediaEntity *entity : entities) {\n+\t\t/*\n+\t\t * Locate the downstream entity by following the first enabled\n+\t\t * link from a source pad.\n+\t\t */\n+\t\tconst MediaPad *pad = nullptr;\n+\t\tconst MediaLink *link = nullptr;\n+\n+\t\tfor (const MediaPad *p : entity->pads()) {\n+\t\t\tif (p->flags() & MEDIA_PAD_FL_SOURCE) {\n+\t\t\t\tpad = p;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n+\t\tif (!pad)\n+\t\t\tcontinue;\n+\n+\t\tfor (const MediaLink *l : pad->links()) {\n+\t\t\tif (l->flags() & MEDIA_LNK_FL_ENABLED ||\n+\t\t\t !(l->flags() & MEDIA_LNK_FL_IMMUTABLE)) {\n+\t\t\t\tlink = l;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n+\t\tif (!link)\n+\t\t\tcontinue;\n+\n+\t\tMediaEntity *remote = link->sink()->entity();\n+\t\tif (remote->function() == MEDIA_ENT_F_PROC_VIDEO_ISP)\n+\t\t\tsensors.push_back(remote);\n+\t\telse\n+\t\t\tsensors.push_back(entity);\n+\t}\n+\n+\t/*\n+\t * Remove duplicates, in case multiple sensors are connected to the\n+\t * same ISP.\n+\t */\n+\tstd::sort(sensors.begin(), sensors.end());\n+\tauto last = std::unique(sensors.begin(), sensors.end());\n+\tsensors.erase(last, sensors.end());\n+\n+\treturn sensors;\n+}\n+\n bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n {\n \tconst SimplePipelineInfo *info = nullptr;\n@@ -892,19 +966,7 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n \t}\n \n \t/* Locate the sensors. */\n-\tstd::vector sensors;\n-\n-\tfor (MediaEntity *entity : media_->entities()) {\n-\t\tswitch (entity->function()) {\n-\t\tcase MEDIA_ENT_F_CAM_SENSOR:\n-\t\t\tsensors.push_back(entity);\n-\t\t\tbreak;\n-\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n+\tstd::vector sensors = locateSensors();\n \tif (sensors.empty()) {\n \t\tLOG(SimplePipeline, Error) << \"No sensor found\";\n \t\treturn false;\n","prefixes":["libcamera-devel","v2"]}