{"id":15082,"url":"https://patchwork.libcamera.org/api/1.1/patches/15082/?format=json","web_url":"https://patchwork.libcamera.org/patch/15082/","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":"<20211208151527.1404715-2-naush@raspberrypi.com>","date":"2021-12-08T15:15:26","name":"[libcamera-devel,v2,1/2] pipeline: raspberrypi: Move sensor entity detection out of registerCamera()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"62ada8b15aa8e758c9040808c29e75df7232488b","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15082/mbox/","series":[{"id":2828,"url":"https://patchwork.libcamera.org/api/1.1/series/2828/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2828","date":"2021-12-08T15:15:25","name":"Raspberry Pi: Add video mux and bridge support","version":2,"mbox":"https://patchwork.libcamera.org/series/2828/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15082/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15082/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 7FA0DC324B\n\tfor ;\n\tWed, 8 Dec 2021 15:15:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2C00160822;\n\tWed, 8 Dec 2021 16:15:35 +0100 (CET)","from mail-wr1-x429.google.com (mail-wr1-x429.google.com\n\t[IPv6:2a00:1450:4864:20::429])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2C96860725\n\tfor ;\n\tWed, 8 Dec 2021 16:15:33 +0100 (CET)","by mail-wr1-x429.google.com with SMTP id a18so4641637wrn.6\n\tfor ;\n\tWed, 08 Dec 2021 07:15:33 -0800 (PST)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:27d5:9305:f572:6623])\n\tby smtp.gmail.com with ESMTPSA id\n\t10sm3998857wrb.75.2021.12.08.07.15.31\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 08 Dec 2021 07:15:31 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"SZ+ja6Bu\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=cqUEfJUvmoLjYb1FisS+gsYKY5V17Z8BcEWse6YTuFg=;\n\tb=SZ+ja6Bu7Kiowovq+z5zTelKqNhxofsZbkaHj4hfDU79U1Guw6/per8JtCggCdzu3d\n\tft5pKmr1v/Z7lmOEhsjTrrVdcSJZskCHLhzYmjzG0DllqJrmsyXJX1q9h9RQOxQLY0Oy\n\tobqgZtLo9GpT4g7hxLHSli8H23dTAV+5NCcJos+C5gyJj5lgzREl3dS62+vkzAB1D/Zv\n\tSSWRnCDOrwDhdRdB2cFW9JEh3s3konn6o2COlsp7hLH+OLAH4yFh4q786dE+VYxGuF5o\n\trHNe1LcJIcEDeI4D8y/KTAt9hWFYvxJS7OdSZxqVplotez15dMZLjPYU6hOnZ4hIQLJj\n\tyXBw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=cqUEfJUvmoLjYb1FisS+gsYKY5V17Z8BcEWse6YTuFg=;\n\tb=qS86Uc4khEgk+cFTmDtCy6Yw3klYaPndXkFspVqsW8pXt58zy+VAiudj3eu+sPjYMJ\n\tJIIJ7KM6sMCVDLPAOwkpREt8wM6CrXdDLUEw073waHYU2r4yIYnBEwySe24m8j4ZVABL\n\tU0O2aRSLZqGCxNN4HAHyJwYNq61+TzHHu1VtWHwcFtwzpVmrJn5mnk0yWAidH5I0ECpt\n\t2DS8G3dbDwGMdj0CcjeJEkVMDdJavqZHTR/LojBfdrGFkCTPLyY/2uUOpFCgMDJzkBP5\n\tOjyz/WFXv0gEvdWdZ6Fgiy9iZbN/yCsMTzSjM5QLyFs1hWp1im6ZpOhf0N+HtsuhIOAb\n\tRm0Q==","X-Gm-Message-State":"AOAM532E+N2skKqOJf5E4G6ADFGE9a7dl30De66/KAip0d676i3yWiDw\n\tQxrjxJixsmh1nao2l2JqGMqyd1rYVkKsujGM","X-Google-Smtp-Source":"ABdhPJwE92UpEmfR7baQvGrWc7MPB9WyeLiIiZQcMbZGCbqIa5sGqshEpVuPfUXFNqu6fgwZHk0IcA==","X-Received":"by 2002:a5d:668c:: with SMTP id\n\tl12mr61677928wru.19.1638976532388; \n\tWed, 08 Dec 2021 07:15:32 -0800 (PST)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 8 Dec 2021 15:15:26 +0000","Message-Id":"<20211208151527.1404715-2-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20211208151527.1404715-1-naush@raspberrypi.com>","References":"<20211208151527.1404715-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 1/2] pipeline: raspberrypi: Move sensor\n\tentity detection out of registerCamera()","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":"Enumerate the sensor device entities in PipelineHandlerRPi::match() and loop\nover PipelineHandlerRPi::registerCamera() for each sensor found. This will\nallow the pipeline handler to register multiple cameras attached to a single\nUnicam instance with a Video Mux device.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: Kieran Bingham \n---\n .../pipeline/raspberrypi/raspberrypi.cpp | 35 +++++++++++--------\n 1 file changed, 20 insertions(+), 15 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 86851ac467ad..756878c70036 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -310,7 +310,7 @@ private:\n \t\treturn static_cast(camera->_d());\n \t}\n \n-\tint registerCamera(MediaDevice *unicam, MediaDevice *isp);\n+\tint registerCamera(MediaDevice *unicam, MediaDevice *isp, MediaEntity *sensorEntity);\n \tint queueAllBuffers(Camera *camera);\n \tint prepareBuffers(Camera *camera);\n \tvoid freeBuffers(Camera *camera);\n@@ -1029,16 +1029,28 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \t}\n \n-\tint ret = registerCamera(unicamDevice, ispDevice);\n-\tif (ret) {\n-\t\tLOG(RPI, Error) << \"Failed to register camera: \" << ret;\n-\t\treturn false;\n+\t/*\n+\t * The loop below is used to register multiple cameras behind one or more\n+\t * video mux devices that are attaced to a particular Unicam instance.\n+\t * Obviously these cameras cannot be used simultaneously.\n+\t */\n+\tunsigned int numCameras = 0;\n+\tfor (MediaEntity *entity : unicamDevice->entities()) {\n+\t\tif (entity->function() != MEDIA_ENT_F_CAM_SENSOR)\n+\t\t\tcontinue;\n+\n+\t\tint ret = registerCamera(unicamDevice, ispDevice, entity);\n+\t\tif (ret)\n+\t\t\tLOG(RPI, Error) << \"Failed to register camera \"\n+\t\t\t\t\t<< entity->name() << \": \" << ret;\n+\t\telse\n+\t\t\tnumCameras++;\n \t}\n \n-\treturn true;\n+\treturn !!numCameras;\n }\n \n-int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp)\n+int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, MediaEntity *sensorEntity)\n {\n \tstd::unique_ptr data = std::make_unique(this);\n \n@@ -1079,14 +1091,7 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp)\n \tdata->isp_[Isp::Output1].dev()->bufferReady.connect(data.get(), &RPiCameraData::ispOutputDequeue);\n \tdata->isp_[Isp::Stats].dev()->bufferReady.connect(data.get(), &RPiCameraData::ispOutputDequeue);\n \n-\t/* Identify the sensor. */\n-\tfor (MediaEntity *entity : unicam->entities()) {\n-\t\tif (entity->function() == MEDIA_ENT_F_CAM_SENSOR) {\n-\t\t\tdata->sensor_ = std::make_unique(entity);\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n+\tdata->sensor_ = std::make_unique(sensorEntity);\n \tif (!data->sensor_)\n \t\treturn -EINVAL;\n \n","prefixes":["libcamera-devel","v2","1/2"]}