{"id":14810,"url":"https://patchwork.libcamera.org/api/1.1/patches/14810/?format=json","web_url":"https://patchwork.libcamera.org/patch/14810/","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":"<20211126153538.2594702-1-naush@raspberrypi.com>","date":"2021-11-26T15:35:37","name":"[libcamera-devel,v4,1/2] pipeline: raspberrypi: Split out device enumeration and camera registration","commit_ref":"762f38811b696cdf7b43f580f18f9c98c209f5ff","pull_url":null,"state":"accepted","archived":false,"hash":"27e6c9635b2af0be70723cf237ce8143ee87fdea","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/14810/mbox/","series":[{"id":2764,"url":"https://patchwork.libcamera.org/api/1.1/series/2764/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2764","date":"2021-11-26T15:35:37","name":"[libcamera-devel,v4,1/2] pipeline: raspberrypi: Split out device enumeration and camera registration","version":4,"mbox":"https://patchwork.libcamera.org/series/2764/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14810/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14810/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 C4652BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 26 Nov 2021 15:35:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CAC9060543;\n\tFri, 26 Nov 2021 16:35:46 +0100 (CET)","from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com\n\t[IPv6:2a00:1450:4864:20::32d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C01C16011E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Nov 2021 16:35:44 +0100 (CET)","by mail-wm1-x32d.google.com with SMTP id\n\tp27-20020a05600c1d9b00b0033bf8532855so7061455wms.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Nov 2021 07:35:44 -0800 (PST)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:89da:d0c:9f56:bbfc])\n\tby smtp.gmail.com with ESMTPSA id\n\tp14sm10591272wms.29.2021.11.26.07.35.43\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 26 Nov 2021 07:35:43 -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=\"bE9KgCj9\"; 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:mime-version\n\t:content-transfer-encoding;\n\tbh=tAd/+FWYTaYdnufy3EhXNrXYjVtOl7fyDxFM3h6YwaA=;\n\tb=bE9KgCj9WS9qM5x5MQdHimkwp2b/jVaxX/XF/vAiU+up2TYd04NDL7eEPNy7bz/27U\n\tpfZFcvU/tCyitfblaU8+r8yESsFc+aUE1kXNmx+VuNzSOexsXg4ju6p4jTNUZiZIdzZx\n\tpTJvxugzj5ijtbg/U1sNDxNeRTDTlRpya2LHQvlrFJ0PunrqyZhzmvAOD8g6pPclFQbL\n\t8P7PhUAtO4cUQN+cs3X4pN4bBSYyFwYBqff5GOwmN/qZvJfKP4u6brFgnqRhqZqhBa+r\n\tK2v2YuadGkSzgl9BDzbU8VHbieIC25Wh9XDnBf0qQGqthPuGeqSxm4Jlcb84iMcK0lKS\n\tXEBw==","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:mime-version\n\t:content-transfer-encoding;\n\tbh=tAd/+FWYTaYdnufy3EhXNrXYjVtOl7fyDxFM3h6YwaA=;\n\tb=zUN4EXaa7N0JhxmC7bHVL0/PMgQnXExv+4DhRhKAWQXCt6dsK6zSy3YRmbo+/0osb4\n\trToZb1SoQ2dNv1blN5Q5HrZ+pKFfeUY1bjGdXjNjHsqFQR28J9V5JYpwivbcw0BURJ4H\n\tku3DQ75I7B/7YNTwtqcyERHGqdz2BvFspUnlcpTsTZ0h7x4V6t73OZwQxOwJTJsMCVk8\n\twKN/9gUYypIA3iWFsX/n99tatCv1R/Ws2zLW+W3b/Tk1ZJt/IMAVZjzKyxRiANuACQGQ\n\tZEkK9Xw9PmXqoBnRfGb8T5Np43Y9MWhyx+Jiy3NK37qNV2yu+PHj0hstngT2s38MYkQk\n\tyJMA==","X-Gm-Message-State":"AOAM530LV00NjK76MdPNt67ZMvwWB/XG3m/YhJRSiiHLD9r+33lSBF36\n\th1g7Q8HJT7W4yTDMBIUT815qLAZdfoFh51zE","X-Google-Smtp-Source":"ABdhPJxPtzomvQuWWLRFIJX3yzxEbMtqTwqf2PFQdBqsdMkwazVwDGp6pLJR9VvYl6RsZiCH6LWPWA==","X-Received":"by 2002:a1c:9d03:: with SMTP id\n\tg3mr15716526wme.143.1637940944130; \n\tFri, 26 Nov 2021 07:35:44 -0800 (PST)","From":"Naushir Patuck <naush@raspberrypi.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 26 Nov 2021 15:35:37 +0000","Message-Id":"<20211126153538.2594702-1-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 1/2] pipeline: raspberrypi: Split out\n\tdevice enumeration and camera registration","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":"Split out PipelineHandlerRPi::match() so that media device enumeration and\nacquisition is separated from camera registration. The former logic remains\nin PipelineHandlerRPi::match(), whereas the latter logic is moved into a new\nPipelineHandlerRPi::registerCamera() member function.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex ad526a8be6a2..5a6dfa4e8b2a 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -314,6 +314,7 @@ private:\n \t\treturn static_cast<RPiCameraData *>(camera->_d());\n \t}\n \n+\tbool registerCamera();\n \tint queueAllBuffers(Camera *camera);\n \tint prepareBuffers(Camera *camera);\n \tvoid freeBuffers(Camera *camera);\n@@ -1013,6 +1014,11 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n \tif (!isp_)\n \t\treturn false;\n \n+\treturn registerCamera();\n+}\n+\n+bool PipelineHandlerRPi::registerCamera()\n+{\n \tstd::unique_ptr<RPiCameraData> data = std::make_unique<RPiCameraData>(this);\n \tif (!data->dmaHeap_.isValid())\n \t\treturn false;\n@@ -1173,7 +1179,7 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n \tconst std::string &id = data->sensor_->id();\n \tstd::shared_ptr<Camera> camera =\n \t\tCamera::create(std::move(data), id, streams);\n-\tregisterCamera(std::move(camera));\n+\tPipelineHandler::registerCamera(std::move(camera));\n \n \treturn true;\n }\n","prefixes":["libcamera-devel","v4","1/2"]}