{"id":14711,"url":"https://patchwork.libcamera.org/api/1.1/patches/14711/?format=json","web_url":"https://patchwork.libcamera.org/patch/14711/","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":"<20211123131040.1542581-2-naush@raspberrypi.com>","date":"2021-11-23T13:10:39","name":"[libcamera-devel,v3,1/2] pipeline: raspberrypi: Split out device enumeration and camera registration","commit_ref":null,"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/14711/mbox/","series":[{"id":2745,"url":"https://patchwork.libcamera.org/api/1.1/series/2745/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2745","date":"2021-11-23T13:10:38","name":"Raspberry Pi: Multi-camera changes","version":3,"mbox":"https://patchwork.libcamera.org/series/2745/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14711/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14711/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 E3BE2BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Nov 2021 13:11:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9CAD66039C;\n\tTue, 23 Nov 2021 14:11:19 +0100 (CET)","from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com\n\t[IPv6:2a00:1450:4864:20::32e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E48160121\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Nov 2021 14:11:15 +0100 (CET)","by mail-wm1-x32e.google.com with SMTP id\n\ti8-20020a7bc948000000b0030db7b70b6bso2204757wml.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Nov 2021 05:11:15 -0800 (PST)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:34c6:a31e:c2e1:260d])\n\tby smtp.gmail.com with ESMTPSA id\n\tb197sm1106142wmb.24.2021.11.23.05.11.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 23 Nov 2021 05:11:13 -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=\"grSW6ikL\"; 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=c+DaaEB0OradqvdNNgMUiPLcQhdP5VfIfypiBu6Wn/A=;\n\tb=grSW6ikLFwsAOweut/65X1EBYCFbiSUyp5H4KpGwaqmxvZqKAX3yGzUAB5k25xmPrL\n\tjIFVNcvIvi5o4CVOdD7ZLZyAIABYaFzxaPLqaw4rbBd3LwBgQAlk/7A3yf9BdvqJDABA\n\tSv32ayjVsdFIkEBDg8eMfhBOJ3186j2KiDZj/6Whb5bvOfY19DuBkE+p1r5VFI2VRaAi\n\tgAosBk4YWz0gek2plNNGzxQMB2NA+EytPQw41egHa2IzwTdRxhRwoyj0hgrqihnSr5J/\n\tLcwaEAimBVkcVx010MMzhcV4aTnW8ySZ5wYuCb4tyis7a0gQsXA4euqi63M3I1cq5Weh\n\t/6sQ==","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=c+DaaEB0OradqvdNNgMUiPLcQhdP5VfIfypiBu6Wn/A=;\n\tb=njsd+LnUouT3USJ/UwGF7Gmjj7/MVSxH46Av4SLlnMYJPlGG+AZpC4UyY5yc6VGoMO\n\trridHz75bguJoXKanLnwFBxFPmPMIq+g3wHtuLaAWcXx6XmWXGUE4kU0ykKN9MjKyRYB\n\tDdtkITKt2Irc/Jjgz5m+uQtdetqNOpNI4SSYU0i8yQGFjCakIjzC/ajPc+l4wss8UTmW\n\trGSq9SA+hWAqyL31xP26u4G+2+xdhe9dOxStw3jc50aYD+4QHAguVGn1sC0PSLg1OQkj\n\tv0h+cbBXwXKVqKJpNnvFORPkmgtMJmZFLrbth3IhOUNKJtAPo39QPApudOFWLYyxqLR6\n\tY2wA==","X-Gm-Message-State":"AOAM533sTPE1orf/bgQ44BU8AQqhYCJ9KaLNRjNUGWu/PI+H7Ymie5SB\n\tThl8ZGPUiCvErOcbN03sQ9YQ8mapuhxLFl30","X-Google-Smtp-Source":"ABdhPJwbOlhPp2+a5glelRtvUWCEgudQ3cAJAhGIh/qx0r/YHacKcFC1/QiaQBh1DuRN/rrtCdppVw==","X-Received":"by 2002:a1c:8002:: with SMTP id b2mr3093672wmd.2.1637673074891; \n\tTue, 23 Nov 2021 05:11:14 -0800 (PST)","From":"Naushir Patuck <naush@raspberrypi.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 23 Nov 2021 13:10:39 +0000","Message-Id":"<20211123131040.1542581-2-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20211123131040.1542581-1-naush@raspberrypi.com>","References":"<20211123131040.1542581-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 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 4f6c699a4379..12fd38061241 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -311,6 +311,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@@ -1010,6 +1011,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@@ -1170,7 +1176,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","v3","1/2"]}