From patchwork Tue Jul 25 08:55:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18885 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 2E4A8BDB13 for ; Tue, 25 Jul 2023 08:56:16 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 679B7628C7; Tue, 25 Jul 2023 10:56:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1690275374; bh=1fnLpr1wa84MpD0IMDou9Rq/4rFrHRBJBNExdpYPyao=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=oC4S3EG4NWUWjxGysTO38suIJzlF11jtLboTw8DqAyHspFydfBB1A/gA7uemZKo/I WLY2adtjnwmvnNCN7RiHfji2WjcRIKlvd7nfnGK3JKwtsEqPLBfb3yp2vdT/vVZYhO uWjD/O+I+slBnKG92/M6rqT9JJub0+DMC8zL94sBnco9fgyQIVqeXKVZu3iirmk+v7 dQjWnjVE5N4SoK21b1GfPQ4n+9qgsA4QoA5hsJafXCH/k2IZL2T1AVl3h9frm6RnAw jM+QfXbvPNttQOqAEJl2Qr3nszs4HMsDImQbnO4VHNMotx4N8qkfYxWsszFkWDaLSo CBCdu6Kv35A5w== Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 10200628C2 for ; Tue, 25 Jul 2023 10:56:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="gUWOVwa7"; dkim-atps=neutral Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3172144c084so4870565f8f.1 for ; Tue, 25 Jul 2023 01:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1690275369; x=1690880169; 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=afYDoMhDTlrP7nKJ5B2hFBGcqavnrUzYmRNnMdv926w=; b=gUWOVwa7qw4z1QrPq49CcZj/cKqYKq3pUFCPJzzXP8aeVyffDs08RlC67iDJI4stgA DSGcQXR/8pDsy37Jm2u+Aujx1ER2EsRLu2TIzG7bwbTBFitb4p1xM74FMudg+FTYAKA1 jIbpdWdbFiEE4FxhUc4DW1LxIeMCIgY25SaIPjSbEVV/+OSqEwlSttcKPcarW2o1VBNn lhPUOexTtv8kvfESLl2riA98GVcOuwN97BUAu1x32fzRoxmJ18m+9UUM2m6ffYu/TfJO tO3L/65uJkYxOWOckDL21bGBWvOB6jcgEh0Wq4e6dkEYJp74xP0buL6NeXPHWKvOsVdW 9Rgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690275369; x=1690880169; 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=afYDoMhDTlrP7nKJ5B2hFBGcqavnrUzYmRNnMdv926w=; b=NIK/rGesX7ajygQVmsd3ikgBmY33QFe0MIXnRDcVodrFDkt3AayqvMi3UcbDkLepY6 wZlusvbzjPAXAIpegmKAMhZ/z28UQhwExcNvHcLPiNWTSivFLVYpn1oAtuQJbGxRtpji ERjW1RpiaWs3vTCgcRGVvcQZWEVjLwHiwMkOxLJkStvsJfloGymZKcGoomsWpmGGwLEa AGZ6SA6p+PJKh12XtrXaMhVmkmn4keqXiQcmrbMssbe757i255+DByHFKiAjItsSQ3NB b2qXq/NFLZxDpu3wajJ1PIuh/VR3HxjrrsPvXqw82cV4FgzST6rPalgoX1I3rxESoiFD fZiA== X-Gm-Message-State: ABy/qLbdcOEDLqKIb4dvbAcvJjTuRtH+NsHL9acXY/qX4w8mvAmMhM0o KtI0XhiwxXhopasVtj2kzQSkzGTNk/vcRp1gGEgWDA== X-Google-Smtp-Source: APBJJlHR5VouFhGzZU7N0gSuABr7Gyth/eOiwHVSvNqmih/oLr4OtcOTT2YqoDllTkcqTS5lzvfwmw== X-Received: by 2002:adf:de0b:0:b0:317:6edb:6138 with SMTP id b11-20020adfde0b000000b003176edb6138mr591310wrm.62.1690275369492; Tue, 25 Jul 2023 01:56:09 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id l7-20020adfe587000000b0030c4d8930b1sm1951225wrm.91.2023.07.25.01.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 01:56:09 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Tue, 25 Jul 2023 09:55:39 +0100 Message-Id: <20230725085540.24863-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725085540.24863-1-naush@raspberrypi.com> References: <20230725085540.24863-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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 Cc: Jacopo Mondi 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 Reviewed-by: Kieran Bingham Reviewed-by: Kieran Bingham --- 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 74b5abf447c7..e1858c731f57 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);