From patchwork Thu Mar 17 14:08:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 15472 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7AD89C3263 for ; Thu, 17 Mar 2022 14:08:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6C0D9601F8; Thu, 17 Mar 2022 15:08:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1647526116; bh=kXB2y+u+v0J4lOfnEEEK0fEHQi8UCDN+opF1eo2OslI=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=yWK+jD97rYfq3R1fzaw8Oq7O4+m4e4U8WAyzUyn6+E01Unhx5pB6iHGzeZ0TLmQHa jtPz+Nav16H7cbuzYiBbPEXa32xGcUQ6DB01s4RGGZwV6ADgnY/MpfNTDpFm11dcIA gsI6ohbTsW7Aqetj/WTMybYSL3fdC2WtfUljW7NukgVZOpKDUwwmr6ANZ+cpdkWZju +g0OMbLO0RQjj6RUQ/UyjX6bR1T1r3DrBoeSmacPg2BMkqNwWjLi4Ia0/Dz71+GS4I /hmSYO4mBT+2MdtgRvZGxeOstUyrQRy7zSb2pvxD4W2fwYPTYAho+W5wASrIULFFid W9o4u4jGr/WGA== Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9863A604DC for ; Thu, 17 Mar 2022 15:08:34 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="e8oWdeSa"; dkim-atps=neutral Received: by mail-wr1-x433.google.com with SMTP id h15so7540407wrc.6 for ; Thu, 17 Mar 2022 07:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gxKs37xBf6jAcWLRbf5L/O2SlW/iZaDg6COx8v6by6c=; b=e8oWdeSajxxUuNt4YsII6biQyuOlh/56P5HnKFDb9GxwtD2jFI1/MW8iUqGgNWOTUt NQ84cPgeDVt+tsi8t6dHzch8KpVSmmcyHlHJ22+nHH7WQhERYo3VEXwAcG7itgk1ZMyG T/BthTVjaolLr0SfTFV1OBoEJKUYLOy66Et5BUeOiL4IGX+KIIAxEyPY9UJ6semBWylm SevW1WOi/25y++5BrHu6fGQWpHP+StSQvAeWuIvaUcB7Jxf8H+XOS01F5xiTUqybqpc+ OEDkO+VokuiuDqnqVQmDfUnNMQuGzoJQh0i76HyJ0avM4/Uprnx0zQErZYWTLh31ORQA ywxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gxKs37xBf6jAcWLRbf5L/O2SlW/iZaDg6COx8v6by6c=; b=VzNkkWOm1tEbiqUFGWvikAyYA64Ax4iOP+EooMjPIpeBcCM3sGhGfa3Z7yK1uxQAUo KCvaTCDdEDHgBUmxGxBvO2rpArMQhuonNFDyX+jhsXiphy07Ejn+c63wMgAKYb2tW1xM /jGzYCVmRL8vJPrXEYZoYq0ugbMjaLY6+L+bJPSJXbgsNSp9LZERFKLhd2nqSaM1VmLR YKlsK+c31Gq6laT2ucOhe9I+MTMNe4qu1EzRDodjISr/s/EQTnU2xEGYClw1pTgDag40 bgGqkP4rF+eQpAa6a60uVwNkLqK1G8u2okjdg6fpM+sBinggXzlAh3JnaLKIkXg0uNiL TZTw== X-Gm-Message-State: AOAM530ooM/YXyWu4uR2vD0PmHuP/NKrYp1Rq0Ul+uYweof7Yn9poKWL qk0nzTcx6w/WO6lkTvHq6NiSVZbHBYBz7g== X-Google-Smtp-Source: ABdhPJxllR70ZSaesga6KjsQZf2dstmsgZ/h61XMCbMLIhjazKCAo7zWO3s9ne6TPr6+34SD21k9rA== X-Received: by 2002:adf:efd2:0:b0:203:db42:c56c with SMTP id i18-20020adfefd2000000b00203db42c56cmr4096391wrp.698.1647526114027; Thu, 17 Mar 2022 07:08:34 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:371b:8e01:111f:5322]) by smtp.gmail.com with ESMTPSA id z5-20020a05600c0a0500b0037fa93193a8sm5287831wmp.44.2022.03.17.07.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 07:08:33 -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 Subject: [libcamera-devel] [PATCH v2 2/6] pipeline: raspberrypi: Move freeBuffers() to the RPiCameraData class X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This function used to clear the camera buffers does not belong in the PipelineHandlerRPi class as it only access members of the RPiCameraData, so move it. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Tested-by: David Plowman Reviewed-by: Laurent Pinchart --- .../pipeline/raspberrypi/raspberrypi.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 43e87a406036..2281b43fc3ac 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -189,6 +189,7 @@ public: { } + void freeBuffers(); void frameStarted(uint32_t sequence); int loadIPA(ipa::RPi::SensorConfig *sensorConfig); @@ -330,7 +331,6 @@ private: int registerCamera(MediaDevice *unicam, MediaDevice *isp, MediaEntity *sensorEntity); int queueAllBuffers(Camera *camera); int prepareBuffers(Camera *camera); - void freeBuffers(Camera *camera); void mapBuffers(Camera *camera, const RPi::BufferMap &buffers, unsigned int mask); }; @@ -1056,7 +1056,7 @@ void PipelineHandlerRPi::stopDevice(Camera *camera) /* Stop the IPA. */ data->ipa_->stop(); - freeBuffers(camera); + data->freeBuffers(); } int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request) @@ -1452,16 +1452,14 @@ void PipelineHandlerRPi::mapBuffers(Camera *camera, const RPi::BufferMap &buffer data->ipa_->mapBuffers(ipaBuffers); } -void PipelineHandlerRPi::freeBuffers(Camera *camera) +void RPiCameraData::freeBuffers() { - RPiCameraData *data = cameraData(camera); - /* Copy the buffer ids from the unordered_set to a vector to pass to the IPA. */ - std::vector ipaBuffers(data->ipaBuffers_.begin(), data->ipaBuffers_.end()); - data->ipa_->unmapBuffers(ipaBuffers); - data->ipaBuffers_.clear(); + std::vector ipaBuffers(ipaBuffers_.begin(), ipaBuffers_.end()); + ipa_->unmapBuffers(ipaBuffers); + ipaBuffers_.clear(); - for (auto const stream : data->streams_) + for (auto const stream : streams_) stream->releaseBuffers(); }