From patchwork Fri Mar 25 09:08:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 15543 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 CB3ACC0F1B for ; Fri, 25 Mar 2022 09:09:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8E2C261FBD; Fri, 25 Mar 2022 10:09:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648199350; 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=A1nuv6x95HOjHFgbX7SRYcmTMgQJwBGqtavNzqkB3H1Xqvk7YZMBFWuNkWkKCorvf 8vkT3GqPybfcEwf6aszOUPegS3g1lh9X6fvZd7tAHHWgMxnBLJU9eWKCbPeyqJwNTn H43rtafbIdoH6Cia81MpYX7rmB5mss4dYujEh6HUCkCksqDO8znvc90WfkPQV6USvA sof2AG9p/9tk5zAxoGXDK/GyldSx8P0sK7fV6UUfdqWNNYmf/BHCytwkZgd5JtaCbN q70G3Y/dnDKn7IATwmWzaUn9nTsoz3l0Pu/aDl2SmnA4yGteG6/MwHGYCWZ5M7FEpT LNx/Apo5TkUpg== Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BD97360136 for ; Fri, 25 Mar 2022 10:09:08 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="HAYeHmeX"; dkim-atps=neutral Received: by mail-wr1-x436.google.com with SMTP id r7so8841695wrc.0 for ; Fri, 25 Mar 2022 02:09:08 -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=HAYeHmeXyx4S6yTTGTVRCSP5UlFgVHiUwwFA5+XIhqL/TD6GOz4P0bgcN39fDmeqUZ pgObMpD6jbPkLADVkceXSGcgpR/vR2rHYlZOUg9QUr9GAawQNbKQVw5FRRMlH9xRlGHN JcuCChOjkdfl0/m2yc8fb5uH9SzABWH3XJjpEyAS/O/limrkGArprArjLRLvrSMbdTE2 R++YxrAxSMWB+bS39yzubUzvGFECbbiFjsNZG8SL2GkuzNNHSWHyDUrEV5IZRg29aLH2 Un3Z3oVY/TjOPAiMNfIOjDRmJ9AyBiRq4tcl0VyKdQ3q8uMh82tctqs1hnn//urwteQ5 X0/g== 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=6CC+UtpZaejqbrmjVlanN5ZzOCDArbMp+tFZXWkz4sFc4s9RFZpJ9FkL7STuDXtgBg glxj3Vn+BNqVQLVaZU8EBZjNwGzrM/WdKkfaCjbkIUh9as6Ri60QZTnOZrp4cZ/eb1dP 3OXsmgZScRmb5X5GDZnY5iCAL83ggAkG+xWPECvx+H8PyUi8yMeX7EqioYX706fVMjjX Z6FFN6iDyOAr++w9jjlMi7aP33rgO2VY1XvxD6JvL+q5Cgr1AQmwUqoWuXmuDMKkZPRJ ERFUjAvmGcuOfWy4TgYJcrEoHBoGDx6yztm10fswTYymVfJXMBDluU926YTkZ3o+AZpW ci8A== X-Gm-Message-State: AOAM533HAa+W15YfMSZs1EwJSLJHQh/F7Ztr/LcOAXCbYPte6r7Vjvja Jmb4VtuoeLyOgzWFkG34gIoEQzD0McuYGg== X-Google-Smtp-Source: ABdhPJzGDHkGtuKCGk3W1+rGFvyEcnSu7N7D5mLZu5yjjZB/U+sLPRWpg5N+tvp4zoi65gB1tOHrOA== X-Received: by 2002:adf:eb4d:0:b0:1ed:c1f7:a951 with SMTP id u13-20020adfeb4d000000b001edc1f7a951mr7908323wrn.454.1648199348048; Fri, 25 Mar 2022 02:09:08 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:478c:773f:4734:d0bc]) by smtp.gmail.com with ESMTPSA id c4-20020a056000184400b0020584c40778sm4915297wri.103.2022.03.25.02.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 02:09:07 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Fri, 25 Mar 2022 09:08:57 +0000 Message-Id: <20220325090903.880311-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325090903.880311-1-naush@raspberrypi.com> References: <20220325090903.880311-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 2/8] 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(); }