Patch Detail
Show a patch.
GET /api/1.1/patches/15162/?format=api
{ "id": 15162, "url": "https://patchwork.libcamera.org/api/1.1/patches/15162/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15162/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20211214140002.3552445-2-naush@raspberrypi.com>", "date": "2021-12-14T14:00:01", "name": "[libcamera-devel,v4,1/2] pipeline: raspberrypi: Move sensor entity detection out of registerCamera()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "36450bd158321de60381eab163eaabf7e81cd383", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/1.1/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15162/mbox/", "series": [ { "id": 2844, "url": "https://patchwork.libcamera.org/api/1.1/series/2844/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2844", "date": "2021-12-14T14:00:00", "name": "Raspberry Pi: Add video mux and bridge support", "version": 4, "mbox": "https://patchwork.libcamera.org/series/2844/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15162/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15162/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 4016BC324B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 14 Dec 2021 14:00:10 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 75700608E9;\n\tTue, 14 Dec 2021 15:00:08 +0100 (CET)", "from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com\n\t[IPv6:2a00:1450:4864:20::42a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 26060605A7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 14 Dec 2021 15:00:06 +0100 (CET)", "by mail-wr1-x42a.google.com with SMTP id q3so32525906wru.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 14 Dec 2021 06:00:06 -0800 (PST)", "from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:8958:60a:582a:396])\n\tby smtp.gmail.com with ESMTPSA id\n\tm7sm2160999wml.38.2021.12.14.06.00.05\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 14 Dec 2021 06:00:05 -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=\"PPLxMMEN\"; 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=nJnkmgQAsgdErldvbjoJq1Zg/UvxAKQrj2jHEwu8eT0=;\n\tb=PPLxMMENoV8N2lsMpvxiDXW7KTHgu3lffwJph5bUG58afeDRWbN9FwsqTqeRK4djl1\n\tybz5kT9Idx77FYZ0NGFlDtNFbEvAiFHKRLOEl6/5JpBE4ygQSJAwDGbiNYxh2DGEgRav\n\tyPiar+CuevjDZjm3s9jc2Q7nJHkZ+egMckrFREd1YAiskX7hzZogNahzb9f9DPs1KmjT\n\tu96ZQwBkafzQQsFhXbr+P33l6RW7fGUbS4NBvPG77cVzDvO0BPBtvUQwYfGy90OqZSxh\n\tljwOWs9fPquQG4CU9TmPu1ZHln4m8J6DCwpZD9G3B+IG/ZDFseSeW9IZI3fUudP9Zx9x\n\tXIUA==", "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=nJnkmgQAsgdErldvbjoJq1Zg/UvxAKQrj2jHEwu8eT0=;\n\tb=W4PRnQvfXZ+6jbU4fQ2UTAkrUSv9oLfu5bVKMPsP6CQe9oNI7F5MgtwiicoFhjygNf\n\tfJ46/PFxQdkkqfWKwdBwQX1Y9aFT1eAqviJEY7qBZp3OsBsXwk9JVH4aqi0orf0k6gP1\n\tPgEwZZJ3fpvGHvo9vLUc73THCh5AfYDF9+gqImmqmNVI1a5P2iNDm1+Ffa6F4iH0AE1I\n\tvT0rfVNakq356jCeSZCSfcq2uyxss15HsWR0zNZN1qyQAFHgbShmng4VRTMob9ZeaRHJ\n\t70iJOYj7HL2ZYyjSInbwmBjmKMLRRCNOQOgBd3nO+wVmFmmq6WyRF1Ssy/tFKMvy1leP\n\trwEA==", "X-Gm-Message-State": "AOAM5323ZywqrXmWPWQXks5YaWDgsTYx0ioUWAW2u4AazjijyuolG03V\n\tZz2FQYAKE6DkEMCMqLHEDxGk5C5wpiV/qg==", "X-Google-Smtp-Source": "ABdhPJw96eQYEM1X7ZoDNzFfRAa6S8jHoJyrLwoI0IdF8HAVZb3IyreLbhnrfbgdkYZUmjphls1e+A==", "X-Received": "by 2002:a5d:6c67:: with SMTP id r7mr5853527wrz.286.1639490405659;\n\tTue, 14 Dec 2021 06:00:05 -0800 (PST)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 14 Dec 2021 14:00:01 +0000", "Message-Id": "<20211214140002.3552445-2-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20211214140002.3552445-1-naush@raspberrypi.com>", "References": "<20211214140002.3552445-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <naush@raspberrypi.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\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..2a2fb5273eb8 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<RPiCameraData *>(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 attached 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<RPiCameraData> data = std::make_unique<RPiCameraData>(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<CameraSensor>(entity);\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n+\tdata->sensor_ = std::make_unique<CameraSensor>(sensorEntity);\n \tif (!data->sensor_)\n \t\treturn -EINVAL;\n \n", "prefixes": [ "libcamera-devel", "v4", "1/2" ] }