From patchwork Tue Mar 16 15:52:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marian Cichy X-Patchwork-Id: 11598 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 EC8CEBD80C for ; Tue, 16 Mar 2021 15:52:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1400768D5E; Tue, 16 Mar 2021 16:52:34 +0100 (CET) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C4B8568D4C for ; Tue, 16 Mar 2021 16:52:27 +0100 (CET) Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lMBzf-0000V5-3I; Tue, 16 Mar 2021 16:52:27 +0100 Received: from mci by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lMBze-0003Du-Jb; Tue, 16 Mar 2021 16:52:26 +0100 From: Marian Cichy To: libcamera-devel@lists.libcamera.org Date: Tue, 16 Mar 2021 16:52:10 +0100 Message-Id: <20210316155211.6679-6-m.cichy@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210316155211.6679-1-m.cichy@pengutronix.de> References: <20210316155211.6679-1-m.cichy@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: mci@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: libcamera-devel@lists.libcamera.org Subject: [libcamera-devel] [RFC PATCH 5/6] pipeline: simple: rename setupFormats to setupStreamProperties 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: , Cc: graphics@pengutronix.de, Marian Cichy Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This function does not only setup the format anymore but also propagates the frame interval from the camera sensor to the camera interface, so lets choose a more generic name for it. Signed-off-by: Marian Cichy --- src/libcamera/pipeline/simple/simple.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 296412e2..bc969125 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -150,7 +150,7 @@ public: int init(); int setupLinks(); - int setupFormats(V4L2SubdeviceFormat *format, + int setupStreamProperties(V4L2SubdeviceFormat *format, V4L2Subdevice::Whence whence); unsigned int streamIndex(const Stream *stream) const @@ -354,7 +354,7 @@ int SimpleCameraData::init() for (unsigned int code : sensor_->mbusCodes()) { V4L2SubdeviceFormat format{ code, sensor_->resolution() }; - ret = setupFormats(&format, V4L2Subdevice::TryFormat); + ret = setupStreamProperties(&format, V4L2Subdevice::TryFormat); if (ret < 0) { LOG(SimplePipeline, Debug) << "Media bus code " << utils::hex(code, 4) @@ -455,7 +455,7 @@ int SimpleCameraData::setupLinks() return 0; } -int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format, +int SimpleCameraData::setupStreamProperties(V4L2SubdeviceFormat *format, V4L2Subdevice::Whence whence) { SimplePipelineHandler *pipe = static_cast(pipe_); @@ -719,7 +719,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) const SimpleCameraData::Configuration *pipeConfig = config->pipeConfig(); V4L2SubdeviceFormat format{ pipeConfig->code, data->sensor_->resolution() }; - ret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat); + ret = data->setupStreamProperties(&format, V4L2Subdevice::ActiveFormat); if (ret < 0) return ret;