From patchwork Tue Apr 30 18:37:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1143 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A2CB660E5B for ; Tue, 30 Apr 2019 20:38:02 +0200 (CEST) Received: from pendragon.station (net-37-182-44-227.cust.vodafonedsl.it [37.182.44.227]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4CE5931D for ; Tue, 30 Apr 2019 20:38:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1556649482; bh=Vl4wA9p3EhrwJPYSsXEmrxDjsVWt4xcdAm3kiP98Z00=; h=From:To:Subject:Date:In-Reply-To:References:From; b=GhlIkn97IZYaa1zHC57p0486p8DOKwjOVAF7SlMEuBH6bxiyj1tcHsd8YlifGqYRO 8SPPKWk9T3aWg0QYkrBukMnLwzthi1rrXpAXtohSe77ZYud/z1iOaq38LtLimwiEAJ ZbhrrC2RwcC4/NfCOFaNneW4nFHA2a53oqyVTrw8= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 30 Apr 2019 21:37:44 +0300 Message-Id: <20190430183746.28518-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430183746.28518-1-laurent.pinchart@ideasonboard.com> References: <20190430183746.28518-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/5] libcamera: pipeline: Unify naming of configurations in pipeline handlers X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2019 18:38:03 -0000 Name all instances of CameraConfiguration "config", and all instances of StreamConfiguration "cfg" accross all pipeline handlers. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/camera.cpp | 6 ++--- src/libcamera/pipeline/ipu3/ipu3.cpp | 32 ++++++++++++------------ src/libcamera/pipeline/rkisp1/rkisp1.cpp | 14 +++++------ src/libcamera/pipeline/uvcvideo.cpp | 14 +++++------ src/libcamera/pipeline/vimc.cpp | 14 +++++------ src/libcamera/pipeline_handler.cpp | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 6b74eb8e3507..cb45bafe3fb1 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -129,10 +129,10 @@ bool CameraConfiguration::isValid() const return false; for (auto const &it : config_) { - const StreamConfiguration &conf = it.second; + const StreamConfiguration &cfg = it.second; - if (conf.size.width == 0 || conf.size.height == 0 || - conf.pixelFormat == 0 || conf.bufferCount == 0) + if (cfg.size.width == 0 || cfg.size.height == 0 || + cfg.pixelFormat == 0 || cfg.bufferCount == 0) return false; } diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 3aa475481cf9..0041662514e1 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -66,7 +66,7 @@ public: int configureInput(const Size &size, V4L2DeviceFormat *inputFormat); int configureOutput(ImgUOutput *output, - const StreamConfiguration &config); + const StreamConfiguration &cfg); int importBuffers(BufferPool *pool); int exportBuffers(ImgUOutput *output, BufferPool *pool); @@ -224,14 +224,14 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera, const std::vector &usages) { IPU3CameraData *data = cameraData(camera); - CameraConfiguration cameraConfig = {}; + CameraConfiguration config = {}; std::set streams = { &data->outStream_, &data->vfStream_, }; for (const StreamUsage &usage : usages) { - StreamConfiguration streamConfig = {}; + StreamConfiguration cfg = {}; StreamUsage::Role role = usage.role(); IPU3Stream *stream = nullptr; @@ -262,7 +262,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera, * * \todo Clarify ImgU alignment requirements. */ - streamConfig.size = { 2560, 1920 }; + cfg.size = { 2560, 1920 }; break; @@ -294,7 +294,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera, res.width); unsigned int height = std::min(usage.size().height, res.height); - streamConfig.size = { width & ~7, height & ~3 }; + cfg.size = { width & ~7, height & ~3 }; break; } @@ -310,13 +310,13 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera, streams.erase(stream); - streamConfig.pixelFormat = V4L2_PIX_FMT_NV12; - streamConfig.bufferCount = IPU3_BUFFER_COUNT; + cfg.pixelFormat = V4L2_PIX_FMT_NV12; + cfg.bufferCount = IPU3_BUFFER_COUNT; - cameraConfig[stream] = streamConfig; + config[stream] = cfg; } - return cameraConfig; + return config; } int PipelineHandlerIPU3::configureStreams(Camera *camera, @@ -424,10 +424,10 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera, * Apply the largest available format to the stat node. * \todo Revise this when we'll actually use the stat node. */ - StreamConfiguration statConfig = {}; - statConfig.size = cio2Format.size; + StreamConfiguration statCfg = {}; + statCfg.size = cio2Format.size; - ret = imgu->configureOutput(&imgu->stat_, statConfig); + ret = imgu->configureOutput(&imgu->stat_, statCfg); if (ret) return ret; @@ -959,18 +959,18 @@ int ImgUDevice::configureInput(const Size &size, /** * \brief Configure the ImgU unit \a id video output * \param[in] output The ImgU output device to configure - * \param[in] config The requested configuration + * \param[in] cfg The requested configuration * \return 0 on success or a negative error code otherwise */ int ImgUDevice::configureOutput(ImgUOutput *output, - const StreamConfiguration &config) + const StreamConfiguration &cfg) { V4L2Device *dev = output->dev; unsigned int pad = output->pad; V4L2SubdeviceFormat imguFormat = {}; imguFormat.mbus_code = MEDIA_BUS_FMT_FIXED; - imguFormat.size = config.size; + imguFormat.size = cfg.size; int ret = imgu_->setFormat(pad, &imguFormat); if (ret) @@ -982,7 +982,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output, V4L2DeviceFormat outputFormat = {}; outputFormat.fourcc = V4L2_PIX_FMT_NV12; - outputFormat.size = config.size; + outputFormat.size = cfg.size; outputFormat.planesCount = 2; ret = dev->setFormat(&outputFormat); diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 7acf85155e2d..134d3df4e1eb 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -113,16 +113,16 @@ CameraConfiguration PipelineHandlerRkISP1::streamConfiguration(Camera *camera, const std::vector &usages) { RkISP1CameraData *data = cameraData(camera); - CameraConfiguration configs; - StreamConfiguration config{}; + CameraConfiguration config; + StreamConfiguration cfg{}; - config.pixelFormat = V4L2_PIX_FMT_NV12; - config.size = data->sensor_->resolution(); - config.bufferCount = RKISP1_BUFFER_COUNT; + cfg.pixelFormat = V4L2_PIX_FMT_NV12; + cfg.size = data->sensor_->resolution(); + cfg.bufferCount = RKISP1_BUFFER_COUNT; - configs[&data->stream_] = config; + config[&data->stream_] = cfg; - return configs; + return config; } int PipelineHandlerRkISP1::configureStreams(Camera *camera, diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 358e247baade..5d2f1c98fa36 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -89,16 +89,16 @@ PipelineHandlerUVC::streamConfiguration(Camera *camera, const std::vector &usages) { UVCCameraData *data = cameraData(camera); - CameraConfiguration configs; - StreamConfiguration config{}; + CameraConfiguration config; + StreamConfiguration cfg{}; - config.pixelFormat = V4L2_PIX_FMT_YUYV; - config.size = { 640, 480 }; - config.bufferCount = 4; + cfg.pixelFormat = V4L2_PIX_FMT_YUYV; + cfg.size = { 640, 480 }; + cfg.bufferCount = 4; - configs[&data->stream_] = config; + config[&data->stream_] = cfg; - return configs; + return config; } int PipelineHandlerUVC::configureStreams(Camera *camera, diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 83fa9cf4033a..cdf43770a9bf 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -89,16 +89,16 @@ PipelineHandlerVimc::streamConfiguration(Camera *camera, const std::vector &usages) { VimcCameraData *data = cameraData(camera); - CameraConfiguration configs; - StreamConfiguration config{}; + CameraConfiguration config; + StreamConfiguration cfg{}; - config.pixelFormat = V4L2_PIX_FMT_RGB24; - config.size = { 640, 480 }; - config.bufferCount = 4; + cfg.pixelFormat = V4L2_PIX_FMT_RGB24; + cfg.size = { 640, 480 }; + cfg.bufferCount = 4; - configs[&data->stream_] = config; + config[&data->stream_] = cfg; - return configs; + return config; } int PipelineHandlerVimc::configureStreams(Camera *camera, diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 345abca89ab8..4ecd6c49efd8 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -175,7 +175,7 @@ PipelineHandler::~PipelineHandler() * \param[in] config The camera configurations to setup * * Configure the specified group of streams for \a camera according to the - * configuration specified in \a configs. The intended caller of this interface + * configuration specified in \a config. The intended caller of this interface * is the Camera class which will receive configuration to apply from the * application. *