Patch Detail
Show a patch.
GET /api/1.1/patches/15472/?format=api
{ "id": 15472, "url": "https://patchwork.libcamera.org/api/1.1/patches/15472/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15472/", "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": "<20220317140827.1835029-3-naush@raspberrypi.com>", "date": "2022-03-17T14:08:23", "name": "[libcamera-devel,v2,2/6] pipeline: raspberrypi: Move freeBuffers() to the RPiCameraData class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5a053ac4811b935215fbbd3ef00542e1bd811547", "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/15472/mbox/", "series": [ { "id": 2972, "url": "https://patchwork.libcamera.org/api/1.1/series/2972/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2972", "date": "2022-03-17T14:08:21", "name": "Raspberry Pi: Efficient start/stop/start sequences", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2972/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15472/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15472/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\r\n\t[92.243.16.209])\r\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 7AD89C3263\r\n\tfor <parsemail@patchwork.libcamera.org>;\r\n\tThu, 17 Mar 2022 14:08:37 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6C0D9601F8;\r\n\tThu, 17 Mar 2022 15:08:36 +0100 (CET)", "from mail-wr1-x433.google.com (mail-wr1-x433.google.com\r\n\t[IPv6:2a00:1450:4864:20::433])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9863A604DC\r\n\tfor <libcamera-devel@lists.libcamera.org>;\r\n\tThu, 17 Mar 2022 15:08:34 +0100 (CET)", "by mail-wr1-x433.google.com with SMTP id h15so7540407wrc.6\r\n\tfor <libcamera-devel@lists.libcamera.org>;\r\n\tThu, 17 Mar 2022 07:08:34 -0700 (PDT)", "from naush-laptop.pitowers.org\r\n\t([2a00:1098:3142:14:371b:8e01:111f:5322])\r\n\tby smtp.gmail.com with ESMTPSA id\r\n\tz5-20020a05600c0a0500b0037fa93193a8sm5287831wmp.44.2022.03.17.07.08.33\r\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\r\n\tThu, 17 Mar 2022 07:08:33 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\r\n\ts=mail; t=1647526116;\r\n\tbh=kXB2y+u+v0J4lOfnEEEK0fEHQi8UCDN+opF1eo2OslI=;\r\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\r\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\r\n\tFrom;\r\n\tb=yWK+jD97rYfq3R1fzaw8Oq7O4+m4e4U8WAyzUyn6+E01Unhx5pB6iHGzeZ0TLmQHa\r\n\tjtPz+Nav16H7cbuzYiBbPEXa32xGcUQ6DB01s4RGGZwV6ADgnY/MpfNTDpFm11dcIA\r\n\tgsI6ohbTsW7Aqetj/WTMybYSL3fdC2WtfUljW7NukgVZOpKDUwwmr6ANZ+cpdkWZju\r\n\t+g0OMbLO0RQjj6RUQ/UyjX6bR1T1r3DrBoeSmacPg2BMkqNwWjLi4Ia0/Dz71+GS4I\r\n\t/hmSYO4mBT+2MdtgRvZGxeOstUyrQRy7zSb2pvxD4W2fwYPTYAho+W5wASrIULFFid\r\n\tW9o4u4jGr/WGA==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\r\n\td=raspberrypi.com; s=google;\r\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\r\n\t:mime-version:content-transfer-encoding;\r\n\tbh=gxKs37xBf6jAcWLRbf5L/O2SlW/iZaDg6COx8v6by6c=;\r\n\tb=e8oWdeSajxxUuNt4YsII6biQyuOlh/56P5HnKFDb9GxwtD2jFI1/MW8iUqGgNWOTUt\r\n\tNQ84cPgeDVt+tsi8t6dHzch8KpVSmmcyHlHJ22+nHH7WQhERYo3VEXwAcG7itgk1ZMyG\r\n\tT/BthTVjaolLr0SfTFV1OBoEJKUYLOy66Et5BUeOiL4IGX+KIIAxEyPY9UJ6semBWylm\r\n\tSevW1WOi/25y++5BrHu6fGQWpHP+StSQvAeWuIvaUcB7Jxf8H+XOS01F5xiTUqybqpc+\r\n\tOEDkO+VokuiuDqnqVQmDfUnNMQuGzoJQh0i76HyJ0avM4/Uprnx0zQErZYWTLh31ORQA\r\n\tywxw==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \r\n\tunprotected) header.d=raspberrypi.com\r\n\theader.i=@raspberrypi.com\r\n\theader.b=\"e8oWdeSa\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\r\n\td=1e100.net; s=20210112;\r\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r\n\t:references:mime-version:content-transfer-encoding;\r\n\tbh=gxKs37xBf6jAcWLRbf5L/O2SlW/iZaDg6COx8v6by6c=;\r\n\tb=VzNkkWOm1tEbiqUFGWvikAyYA64Ax4iOP+EooMjPIpeBcCM3sGhGfa3Z7yK1uxQAUo\r\n\tKCvaTCDdEDHgBUmxGxBvO2rpArMQhuonNFDyX+jhsXiphy07Ejn+c63wMgAKYb2tW1xM\r\n\t/jGzYCVmRL8vJPrXEYZoYq0ugbMjaLY6+L+bJPSJXbgsNSp9LZERFKLhd2nqSaM1VmLR\r\n\tYKlsK+c31Gq6laT2ucOhe9I+MTMNe4qu1EzRDodjISr/s/EQTnU2xEGYClw1pTgDag40\r\n\tbgGqkP4rF+eQpAa6a60uVwNkLqK1G8u2okjdg6fpM+sBinggXzlAh3JnaLKIkXg0uNiL\r\n\tTZTw==", "X-Gm-Message-State": "AOAM530ooM/YXyWu4uR2vD0PmHuP/NKrYp1Rq0Ul+uYweof7Yn9poKWL\r\n\tqk0nzTcx6w/WO6lkTvHq6NiSVZbHBYBz7g==", "X-Google-Smtp-Source": "ABdhPJxllR70ZSaesga6KjsQZf2dstmsgZ/h61XMCbMLIhjazKCAo7zWO3s9ne6TPr6+34SD21k9rA==", "X-Received": "by 2002:adf:efd2:0:b0:203:db42:c56c with SMTP id\r\n\ti18-20020adfefd2000000b00203db42c56cmr4096391wrp.698.1647526114027; \r\n\tThu, 17 Mar 2022 07:08:34 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 17 Mar 2022 14:08:23 +0000", "Message-Id": "<20220317140827.1835029-3-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220317140827.1835029-1-naush@raspberrypi.com>", "References": "<20220317140827.1835029-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 2/6] pipeline: raspberrypi: Move\r\n\tfreeBuffers() to the RPiCameraData class", "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>,\r\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>,\r\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Naushir Patuck via libcamera-devel\r\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This function used to clear the camera buffers does not belong in the\nPipelineHandlerRPi class as it only access members of the RPiCameraData,\nso move it.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: David Plowman <david.plowman@raspberrypi.com>\nTested-by: David Plowman <david.plowman@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n .../pipeline/raspberrypi/raspberrypi.cpp | 16 +++++++---------\n 1 file changed, 7 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\r\nindex 43e87a406036..2281b43fc3ac 100644\r\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\r\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\r\n@@ -189,6 +189,7 @@ public:\r\n \t{\r\n \t}\r\n \r\n+\tvoid freeBuffers();\r\n \tvoid frameStarted(uint32_t sequence);\r\n \r\n \tint loadIPA(ipa::RPi::SensorConfig *sensorConfig);\r\n@@ -330,7 +331,6 @@ private:\r\n \tint registerCamera(MediaDevice *unicam, MediaDevice *isp, MediaEntity *sensorEntity);\r\n \tint queueAllBuffers(Camera *camera);\r\n \tint prepareBuffers(Camera *camera);\r\n-\tvoid freeBuffers(Camera *camera);\r\n \tvoid mapBuffers(Camera *camera, const RPi::BufferMap &buffers, unsigned int mask);\r\n };\r\n \r\n@@ -1056,7 +1056,7 @@ void PipelineHandlerRPi::stopDevice(Camera *camera)\r\n \t/* Stop the IPA. */\r\n \tdata->ipa_->stop();\r\n \r\n-\tfreeBuffers(camera);\r\n+\tdata->freeBuffers();\r\n }\r\n \r\n int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request)\r\n@@ -1452,16 +1452,14 @@ void PipelineHandlerRPi::mapBuffers(Camera *camera, const RPi::BufferMap &buffer\r\n \tdata->ipa_->mapBuffers(ipaBuffers);\r\n }\r\n \r\n-void PipelineHandlerRPi::freeBuffers(Camera *camera)\r\n+void RPiCameraData::freeBuffers()\r\n {\r\n-\tRPiCameraData *data = cameraData(camera);\r\n-\r\n \t/* Copy the buffer ids from the unordered_set to a vector to pass to the IPA. */\r\n-\tstd::vector<unsigned int> ipaBuffers(data->ipaBuffers_.begin(), data->ipaBuffers_.end());\r\n-\tdata->ipa_->unmapBuffers(ipaBuffers);\r\n-\tdata->ipaBuffers_.clear();\r\n+\tstd::vector<unsigned int> ipaBuffers(ipaBuffers_.begin(), ipaBuffers_.end());\r\n+\tipa_->unmapBuffers(ipaBuffers);\r\n+\tipaBuffers_.clear();\r\n \r\n-\tfor (auto const stream : data->streams_)\r\n+\tfor (auto const stream : streams_)\r\n \t\tstream->releaseBuffers();\r\n }", "prefixes": [ "libcamera-devel", "v2", "2/6" ] }