{"id":408,"url":"https://patchwork.libcamera.org/api/patches/408/?format=json","web_url":"https://patchwork.libcamera.org/patch/408/","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":"<20190126162859.32031-3-jacopo@jmondi.org>","date":"2019-01-26T16:28:59","name":"[libcamera-devel,2/2] libcamera: ipu3: Re-work camera data registration","commit_ref":"4f32a3b408430f9bbbac260e8aedd1b90244639d","pull_url":null,"state":"accepted","archived":false,"hash":"eefbab178dcf276662e247aa98cdf6970201fe30","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/408/mbox/","series":[{"id":142,"url":"https://patchwork.libcamera.org/api/series/142/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=142","date":"2019-01-26T16:28:57","name":"libcamera: ipu3: more review fixes","version":1,"mbox":"https://patchwork.libcamera.org/series/142/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/408/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/408/checks/","tags":{},"headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8C6EA60C7F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 26 Jan 2019 17:28:54 +0100 (CET)","from uno.homenet.telecomitalia.it\n\t(host20-49-dynamic.18-79-r.retail.telecomitalia.it [79.18.49.20])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id E364420004;\n\tSat, 26 Jan 2019 16:28:53 +0000 (UTC)"],"X-Originating-IP":"79.18.49.20","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 26 Jan 2019 17:28:59 +0100","Message-Id":"<20190126162859.32031-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190126162859.32031-1-jacopo@jmondi.org>","References":"<20190126162859.32031-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] libcamera: ipu3: Re-work camera data\n\tregistration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","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>","X-List-Received-Date":"Sat, 26 Jan 2019 16:28:55 -0000"},"content":"Re-work camera data registration.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 10 ++++------\n 1 file changed, 4 insertions(+), 6 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 64f639f..80f4a7b 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -210,18 +210,16 @@ void PipelineHandlerIPU3::registerCameras()\n \t\t * registered. The 'camera' shared pointer goes out of scope\n \t\t * and deletes the Camera it manages.\n \t\t */\n-\t\tV4L2Device *videoDev = createVideoDevice(id);\n-\t\tif (!videoDev) {\n+\t\tstd::unique_ptr<IPU3CameraData> data = utils::make_unique<IPU3CameraData>();\n+\t\tdata->dev_ = createVideoDevice(id);\n+\t\tif (!data->dev_) {\n \t\t\tLOG(IPU3, Error)\n \t\t\t\t<< \"Failed to register camera[\"\n \t\t\t\t<< numCameras << \"] \\\"\" << cameraName << \"\\\"\";\n \t\t\tcontinue;\n \t\t}\n \n-\t\tIPU3CameraData *data = new IPU3CameraData();\n-\t\tdata->dev_ = videoDev;\n-\t\tsetCameraData(camera.get(),\n-\t\t\t      std::move(std::unique_ptr<IPU3CameraData>(data)));\n+\t\tsetCameraData(camera.get(), std::move(data));\n \t\tregisterCamera(std::move(camera));\n \n \t\tLOG(IPU3, Info)\n","prefixes":["libcamera-devel","2/2"]}