From patchwork Fri Jul 21 09:37:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18860 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 74C60C32AA for ; Fri, 21 Jul 2023 09:38:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 956F0628CE; Fri, 21 Jul 2023 11:38:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1689932283; bh=yItyVuO2VDL507HlcVK+PBcaMIE7vWWz+HZ9prCd06M=; 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=A5Mk1vbhh0YJt8z0qEixNedSQH8kPSnT2q3Gt7DH+xeniAHBU2tBt42W6eGOM2T4c DgvGHKlBs2lgzyU2APA+HTm0+WKqmiUMRfMvAGMV/Ch0vLMgNqqcKfFA7M5RoP2aWj 85z+iErym3v2TYaQ3RSeQdvXrQ84NeY4MN5f/msNjQ8J737sDhs4ICLuWt6276HKcH pWKpqsmvASqI64g92W2LCMFQv6U8JPv8pThir8PTh3hyGHolgxGRR09BkFthLbtdFt 7FONqvdq57YxFmBxRWcTh1pV1JTQ8VffxjNGBScSyd6dvVi352Vh27LPmf+Jit1voa MbnOdUua73+DA== Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B0E31628C6 for ; Fri, 21 Jul 2023 11:37:59 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="V+WCoVVU"; dkim-atps=neutral Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fbc77e76abso14448605e9.1 for ; Fri, 21 Jul 2023 02:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1689932279; x=1690537079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3uFxpASj7huUvtuSvmY8zK0VJmpliDDCi26iSvJYNH4=; b=V+WCoVVUSBQLU74Kf75rQIIkZpssXtnlvbmMCTPNyDNd0GFOH6SfxyRmTdM+yfJSXE EhtfaUHOffrnwuTI4uz7z0EY/+aiN+Ov2rwPcpZteDKmEwzysOSUw4EITJnxAKJylfPq uMpsxeYziPn+CS1nmYQYvnqE0EX2PCy8lz23VQ5yVCm9jAhQim057X2kk/bYbXxVdYK9 xAP0X3kc/4hHV+BaOxv14xzDCQ8pudSiS8rkxFssakvz/gA5aeB5pcxlqYlKXRkSQ6Ww REnrbo2BBUL1orck3xIQe0pWFXP3iW2nIJ08jdEaottQuMViqcFKU3XPTxfOa2XDt2Cz dJnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689932279; x=1690537079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3uFxpASj7huUvtuSvmY8zK0VJmpliDDCi26iSvJYNH4=; b=BHyhcEOSlqK+nky7m0+Kdd81oIgYEi14u6NmF2+2WxQcrZ9Da6FO9ZcfkiiLWLitSl jrABE97Q1rxsHDE8uGMcuv0OzaK5VCeEuCArUtGn/bhou8PSXFThhjkFVB9wkpzxqHDb JfXQ/AO8V3s/CxtRIGVerCk+5imAfD+gIPdz+9MmH4OdHhQjW+VlenwLRIaPRzX0aix1 Y1vttLkerxbdZIVwInB9EOc4E9zt9TD7mF4RQ4XFkz8fT3GZQU+BxZmnZjWc+9rKZuYq ZXoB12y1B2/4htZUDOkIeG2xArnROs46KmTuPQHiKCdtYdz199UpmLxpn8U9nmnvLL9L 7vCA== X-Gm-Message-State: ABy/qLYuO50Y/+v5tpL9Mdfu/93jHQtaSZW5Jhq/IeKPBxqYpYo/CYBJ mmAYclfBRLwQTzoNIHToZHIaEdjUn0gfMRnkZKgZnw== X-Google-Smtp-Source: APBJJlHyTYqlbPymtkX7Yy86CSsyPtyb9Ks+S4IMOR8Js/Bbxzpk5vMQcdbzxCKr5JyZvsqsb7OH5A== X-Received: by 2002:a05:600c:d7:b0:3fc:1a6:7764 with SMTP id u23-20020a05600c00d700b003fc01a67764mr946751wmm.16.1689932278929; Fri, 21 Jul 2023 02:37:58 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id n12-20020a5d6b8c000000b003143c6e09ccsm3674663wrx.16.2023.07.21.02.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 02:37:58 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Fri, 21 Jul 2023 10:37:58 +0100 Message-Id: <20230721093759.27700-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230721093759.27700-1-naush@raspberrypi.com> References: <20230721093759.27700-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 3/4] pipeline: rpi: Rename RPi::Stream::setExternalBuffer() 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" Since we don't distinguish between externally and internally allocated dma bufs, rename this function to setExportedBuffer() to clearer on its function. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 2 +- src/libcamera/pipeline/rpi/common/rpi_stream.cpp | 2 +- src/libcamera/pipeline/rpi/common/rpi_stream.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index f244edc68a85..fc0c0ec3c53c 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -764,7 +764,7 @@ int PipelineHandlerBase::queueRequestDevice(Camera *camera, Request *request) * outside the v4l2 device. Store it in the stream buffer list * so we can track it. */ - stream->setExternalBuffer(buffer); + stream->setExportedBuffer(buffer); } /* diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp index 07b8de6875fe..e24531e171c8 100644 --- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp @@ -76,7 +76,7 @@ unsigned int Stream::getBufferId(FrameBuffer *buffer) const return it->first; } -void Stream::setExternalBuffer(FrameBuffer *buffer) +void Stream::setExportedBuffer(FrameBuffer *buffer) { bufferMap_.emplace(id_.get(), buffer); } diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h index ca591f99cc45..d1289c4679b9 100644 --- a/src/libcamera/pipeline/rpi/common/rpi_stream.h +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h @@ -76,7 +76,7 @@ public: const BufferMap &getBuffers() const; unsigned int getBufferId(FrameBuffer *buffer) const; - void setExternalBuffer(FrameBuffer *buffer); + void setExportedBuffer(FrameBuffer *buffer); int prepareBuffers(unsigned int count); int queueBuffer(FrameBuffer *buffer);