From patchwork Tue Mar 22 09:22:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 15499 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 D8966BD80A for ; Tue, 22 Mar 2022 09:23:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 73007632E6; Tue, 22 Mar 2022 10:23:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1647940986; 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=hs1TuPaqrL9VWGUDOeWI0LXuz85iWubLoap36AKh+u1FDB3Z4mvlQ29/4YC/D9I4N gvzfvbPdn8A7BJG8yhHcmaF9tFXDPHGC4yi7otItp0UMlu6ntXKJf6HJBi5PRrbTOa GZTWyHlNg0b/keREv9tf2v3Jm8iALU9a8nF5Zqi1AlNVz2nYUvHnANNaoVTCaH3N8W eGk6H7gd3RhGEphdthyjV19mukYtNUwj4hHcm7HjRczoc0Ws2OF8+WwvQ3e7JzuFnR WwcE5QhhYGUWErWd3nHavzzFDxQ3kGDHx2xVaSfuDxUBUa7nJp/4+5kr7KaJrd1oPR kC9WT99txUdMQ== Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9EF2860397 for ; Tue, 22 Mar 2022 10:23:02 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="FC+4xYZ1"; dkim-atps=neutral Received: by mail-wm1-x329.google.com with SMTP id n35so8366753wms.5 for ; Tue, 22 Mar 2022 02:23:02 -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=FC+4xYZ1gFaQy5dA2sAPcut9nfjGJrGtXSfbOuTtyF62zgBEcErQYBeS//EJa99v00 iGZEEfFOGEFj5m3XN9IeODY1hKxaAOeO3cI5GEblmRJCnjDqw3RVap+zhrHfhM/ZIbG3 Jmj3U2o8BC6J7eTDt1dG273rG5SnrWEDgkdzHLkz/5jUEupomrvxBf7VVgXgVz/kZhCL 2DtqSp+2k4LxKIsxhD+KYkQk8JCcKJgs0nYWgY0UEAZOm6d8Br2IFLH0vgdp34T93twS JfQUmJJ+bzyvIi/gzPRkMd7OHdL92Z8Z/YQLC47Mqh9x88EcxmTBGnvlU6uUq5R0q4zV TIBA== 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=mE87f2yMSuU2FdxRyohSq8fqJF+BwTfiAY/0Kp6S8dfd/9xjT/iP8ZBRSEhKZshnOJ 8HRHSIdAamG/bBT5tYvMblg17suJBNxu7UhwX7qmPAYPIPf1VGE3dklI7ANgl2zW8F4R tJwRx5xw0moqcIe0ghVXysqYgvF5kptQqw4w3SqvXNCpN+YEbh1xL8HtW3y7aWV7Pjhp 3Duv5iNgB7sAv4U4FaKux6mQLpNq8bQYycadlLjf9iaaYtwA602/RKoRL7KvQK0DfV9I nJtVv/7S/NK/xABBYSBIEatI1zgbaHmzdKkvVEclBS1dvxyV8VADJSOeOg/TO5XQct6o ZAdA== X-Gm-Message-State: AOAM533Rk2cvFC4vN4+3hPuKSv5OEkEXl+cHvbQlhZ97fdTQHOuffHzN 3DxmPPVATFgMc4vTzFCfVxVbGqOLYqjYVQ== X-Google-Smtp-Source: ABdhPJyxnwreB2bPFI9hg+c8LlF4KieOJC1MOWNqVkVMfXyY5oFG2aWt3SA1CmoCOCVwPMqdrhjjZQ== X-Received: by 2002:a1c:6a01:0:b0:37f:1b18:6b17 with SMTP id f1-20020a1c6a01000000b0037f1b186b17mr2742007wmc.146.1647940982101; Tue, 22 Mar 2022 02:23:02 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:9e9a:99af:e5a6:319b]) by smtp.gmail.com with ESMTPSA id r14-20020a05600c35ce00b0038c9f469979sm1471695wmq.40.2022.03.22.02.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 02:23:01 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Tue, 22 Mar 2022 09:22:51 +0000 Message-Id: <20220322092257.2713521-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220322092257.2713521-1-naush@raspberrypi.com> References: <20220322092257.2713521-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 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(); }