[{"id":1545,"web_url":"https://patchwork.libcamera.org/comment/1545/","msgid":"<20190430185650.GR16573@bigcity.dyn.berto.se>","date":"2019-04-30T18:56:50","subject":"Re: [libcamera-devel] [PATCH 3/5] libcamera: pipeline: Unify naming\n\tof configurations in pipeline handlers","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2019-04-30 21:37:44 +0300, Laurent Pinchart wrote:\n> Name all instances of CameraConfiguration \"config\", and all instances of\n> StreamConfiguration \"cfg\" accross all pipeline handlers.\n> \n> Signed-off-by: Laurent Pinchart \n\nI like these patches which harmonize our wildly organic growth!\n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/camera.cpp | 6 ++---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 32 ++++++++++++------------\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 14 +++++------\n> src/libcamera/pipeline/uvcvideo.cpp | 14 +++++------\n> src/libcamera/pipeline/vimc.cpp | 14 +++++------\n> src/libcamera/pipeline_handler.cpp | 2 +-\n> 6 files changed, 41 insertions(+), 41 deletions(-)\n> \n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index 6b74eb8e3507..cb45bafe3fb1 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -129,10 +129,10 @@ bool CameraConfiguration::isValid() const\n> \t\treturn false;\n> \n> \tfor (auto const &it : config_) {\n> -\t\tconst StreamConfiguration &conf = it.second;\n> +\t\tconst StreamConfiguration &cfg = it.second;\n> \n> -\t\tif (conf.size.width == 0 || conf.size.height == 0 ||\n> -\t\t conf.pixelFormat == 0 || conf.bufferCount == 0)\n> +\t\tif (cfg.size.width == 0 || cfg.size.height == 0 ||\n> +\t\t cfg.pixelFormat == 0 || cfg.bufferCount == 0)\n> \t\t\treturn false;\n> \t}\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 3aa475481cf9..0041662514e1 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -66,7 +66,7 @@ public:\n> \tint configureInput(const Size &size,\n> \t\t\t V4L2DeviceFormat *inputFormat);\n> \tint configureOutput(ImgUOutput *output,\n> -\t\t\t const StreamConfiguration &config);\n> +\t\t\t const StreamConfiguration &cfg);\n> \n> \tint importBuffers(BufferPool *pool);\n> \tint exportBuffers(ImgUOutput *output, BufferPool *pool);\n> @@ -224,14 +224,14 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n> \t\t\t\t\t const std::vector &usages)\n> {\n> \tIPU3CameraData *data = cameraData(camera);\n> -\tCameraConfiguration cameraConfig = {};\n> +\tCameraConfiguration config = {};\n> \tstd::set streams = {\n> \t\t&data->outStream_,\n> \t\t&data->vfStream_,\n> \t};\n> \n> \tfor (const StreamUsage &usage : usages) {\n> -\t\tStreamConfiguration streamConfig = {};\n> +\t\tStreamConfiguration cfg = {};\n> \t\tStreamUsage::Role role = usage.role();\n> \t\tIPU3Stream *stream = nullptr;\n> \n> @@ -262,7 +262,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n> \t\t\t *\n> \t\t\t * \\todo Clarify ImgU alignment requirements.\n> \t\t\t */\n> -\t\t\tstreamConfig.size = { 2560, 1920 };\n> +\t\t\tcfg.size = { 2560, 1920 };\n> \n> \t\t\tbreak;\n> \n> @@ -294,7 +294,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n> \t\t\t\t\t\t res.width);\n> \t\t\tunsigned int height = std::min(usage.size().height,\n> \t\t\t\t\t\t res.height);\n> -\t\t\tstreamConfig.size = { width & ~7, height & ~3 };\n> +\t\t\tcfg.size = { width & ~7, height & ~3 };\n> \n> \t\t\tbreak;\n> \t\t}\n> @@ -310,13 +310,13 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n> \n> \t\tstreams.erase(stream);\n> \n> -\t\tstreamConfig.pixelFormat = V4L2_PIX_FMT_NV12;\n> -\t\tstreamConfig.bufferCount = IPU3_BUFFER_COUNT;\n> +\t\tcfg.pixelFormat = V4L2_PIX_FMT_NV12;\n> +\t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n> \n> -\t\tcameraConfig[stream] = streamConfig;\n> +\t\tconfig[stream] = cfg;\n> \t}\n> \n> -\treturn cameraConfig;\n> +\treturn config;\n> }\n> \n> int PipelineHandlerIPU3::configureStreams(Camera *camera,\n> @@ -424,10 +424,10 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n> \t * Apply the largest available format to the stat node.\n> \t * \\todo Revise this when we'll actually use the stat node.\n> \t */\n> -\tStreamConfiguration statConfig = {};\n> -\tstatConfig.size = cio2Format.size;\n> +\tStreamConfiguration statCfg = {};\n> +\tstatCfg.size = cio2Format.size;\n> \n> -\tret = imgu->configureOutput(&imgu->stat_, statConfig);\n> +\tret = imgu->configureOutput(&imgu->stat_, statCfg);\n> \tif (ret)\n> \t\treturn ret;\n> \n> @@ -959,18 +959,18 @@ int ImgUDevice::configureInput(const Size &size,\n> /**\n> * \\brief Configure the ImgU unit \\a id video output\n> * \\param[in] output The ImgU output device to configure\n> - * \\param[in] config The requested configuration\n> + * \\param[in] cfg The requested configuration\n> * \\return 0 on success or a negative error code otherwise\n> */\n> int ImgUDevice::configureOutput(ImgUOutput *output,\n> -\t\t\t\tconst StreamConfiguration &config)\n> +\t\t\t\tconst StreamConfiguration &cfg)\n> {\n> \tV4L2Device *dev = output->dev;\n> \tunsigned int pad = output->pad;\n> \n> \tV4L2SubdeviceFormat imguFormat = {};\n> \timguFormat.mbus_code = MEDIA_BUS_FMT_FIXED;\n> -\timguFormat.size = config.size;\n> +\timguFormat.size = cfg.size;\n> \n> \tint ret = imgu_->setFormat(pad, &imguFormat);\n> \tif (ret)\n> @@ -982,7 +982,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n> \n> \tV4L2DeviceFormat outputFormat = {};\n> \toutputFormat.fourcc = V4L2_PIX_FMT_NV12;\n> -\toutputFormat.size = config.size;\n> +\toutputFormat.size = cfg.size;\n> \toutputFormat.planesCount = 2;\n> \n> \tret = dev->setFormat(&outputFormat);\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 7acf85155e2d..134d3df4e1eb 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -113,16 +113,16 @@ CameraConfiguration PipelineHandlerRkISP1::streamConfiguration(Camera *camera,\n> \tconst std::vector &usages)\n> {\n> \tRkISP1CameraData *data = cameraData(camera);\n> -\tCameraConfiguration configs;\n> -\tStreamConfiguration config{};\n> +\tCameraConfiguration config;\n> +\tStreamConfiguration cfg{};\n> \n> -\tconfig.pixelFormat = V4L2_PIX_FMT_NV12;\n> -\tconfig.size = data->sensor_->resolution();\n> -\tconfig.bufferCount = RKISP1_BUFFER_COUNT;\n> +\tcfg.pixelFormat = V4L2_PIX_FMT_NV12;\n> +\tcfg.size = data->sensor_->resolution();\n> +\tcfg.bufferCount = RKISP1_BUFFER_COUNT;\n> \n> -\tconfigs[&data->stream_] = config;\n> +\tconfig[&data->stream_] = cfg;\n> \n> -\treturn configs;\n> +\treturn config;\n> }\n> \n> int PipelineHandlerRkISP1::configureStreams(Camera *camera,\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 358e247baade..5d2f1c98fa36 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -89,16 +89,16 @@ PipelineHandlerUVC::streamConfiguration(Camera *camera,\n> \t\t\t\t\tconst std::vector &usages)\n> {\n> \tUVCCameraData *data = cameraData(camera);\n> -\tCameraConfiguration configs;\n> -\tStreamConfiguration config{};\n> +\tCameraConfiguration config;\n> +\tStreamConfiguration cfg{};\n> \n> -\tconfig.pixelFormat = V4L2_PIX_FMT_YUYV;\n> -\tconfig.size = { 640, 480 };\n> -\tconfig.bufferCount = 4;\n> +\tcfg.pixelFormat = V4L2_PIX_FMT_YUYV;\n> +\tcfg.size = { 640, 480 };\n> +\tcfg.bufferCount = 4;\n> \n> -\tconfigs[&data->stream_] = config;\n> +\tconfig[&data->stream_] = cfg;\n> \n> -\treturn configs;\n> +\treturn config;\n> }\n> \n> int PipelineHandlerUVC::configureStreams(Camera *camera,\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index 83fa9cf4033a..cdf43770a9bf 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -89,16 +89,16 @@ PipelineHandlerVimc::streamConfiguration(Camera *camera,\n> \t\t\t\t\t const std::vector &usages)\n> {\n> \tVimcCameraData *data = cameraData(camera);\n> -\tCameraConfiguration configs;\n> -\tStreamConfiguration config{};\n> +\tCameraConfiguration config;\n> +\tStreamConfiguration cfg{};\n> \n> -\tconfig.pixelFormat = V4L2_PIX_FMT_RGB24;\n> -\tconfig.size = { 640, 480 };\n> -\tconfig.bufferCount = 4;\n> +\tcfg.pixelFormat = V4L2_PIX_FMT_RGB24;\n> +\tcfg.size = { 640, 480 };\n> +\tcfg.bufferCount = 4;\n> \n> -\tconfigs[&data->stream_] = config;\n> +\tconfig[&data->stream_] = cfg;\n> \n> -\treturn configs;\n> +\treturn config;\n> }\n> \n> int PipelineHandlerVimc::configureStreams(Camera *camera,\n> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> index 345abca89ab8..4ecd6c49efd8 100644\n> --- a/src/libcamera/pipeline_handler.cpp\n> +++ b/src/libcamera/pipeline_handler.cpp\n> @@ -175,7 +175,7 @@ PipelineHandler::~PipelineHandler()\n> * \\param[in] config The camera configurations to setup\n> *\n> * Configure the specified group of streams for \\a camera according to the\n> - * configuration specified in \\a configs. The intended caller of this interface\n> + * configuration specified in \\a config. The intended caller of this interface\n> * is the Camera class which will receive configuration to apply from the\n> * application.\n> *\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lj1-x231.google.com (mail-lj1-x231.google.com\n\t[IPv6:2a00:1450:4864:20::231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1B37160E5B\n\tfor ;\n\tTue, 30 Apr 2019 20:56:53 +0200 (CEST)","by mail-lj1-x231.google.com with SMTP id s7so11080818ljh.1\n\tfor ;\n\tTue, 30 Apr 2019 11:56:53 -0700 (PDT)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tv22sm999628ljc.28.2019.04.30.11.56.51\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 30 Apr 2019 11:56:51 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=jt7RVDhQP8ii6S6mUaKuMDNO8aSDqJ9g0arOxNMg8sI=;\n\tb=RTFFAzwaZe/C2lEB3yKWr8Hb/K2x8knI0ETmV9oozPNu5H0+RwiB6586AIdD59t5tC\n\tu0d8B/iJUIHV3sm5QIh/UoOFKIBoRsr2/OsxsDridtagin8vml1yEWQHL9ODtDhzWDIF\n\tDCs9aWU53DWfNTkXP8XEihaWmCyadlLKk9CuoGVtI5/rhYn+YqQks7j3UZzTt672OeQ4\n\tsDok1fa6KExb5Boc76ML5XTKl5ZRMAYP2hBEWDcGm3OMhiXHQdP6SeO0R7RdGXMDlrS9\n\toRt0sOy7BWffLigUEHQkuIr9iSwu0NWWdKLZmmWAKUXJyvxGkylv18bGyA0rFSfHsi8Y\n\t4X6g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=jt7RVDhQP8ii6S6mUaKuMDNO8aSDqJ9g0arOxNMg8sI=;\n\tb=J27t5vCnRSNOZST9xkAIz08kOJ9J0CzwVBhfFsET7OzE58FgcfmRcaGZjZEY8j6tTV\n\ts/poeV8xmlxBL6n5CwOvIAxjcFJd66XPL30KknLZcvHpT+PfoUcKsErSn/eM/pbP2vPe\n\tcUQS9H5pvJP6LyTRNzOQCslkgTSgnmYh8kjAmpKBfsUMlSilaKL5ENbv6jr6NxBWfKHW\n\trhflVCGvL1f0moYTs1fJNqveXdUXAqIsgd43+hlDZGcu2B7bEU0il0GUMu57JbJD/Qg1\n\t7losvg3wGr4ZHKRN1D/uv2D6TboWb8Xr5IzgqE550nXQgvlOVOsczXYEYyPSGuolBM0H\n\tx5Qg==","X-Gm-Message-State":"APjAAAXEFhqs8cfslgbG8PwrpWY6XgUvu625qVzfQLX1jSy+yl+QvnO7\n\tIss1hqIFjazhseifo+h6f++GVQ==","X-Google-Smtp-Source":"APXvYqwtPSZOagKiA40j3X7BEtGKyKz4YXJwXItVpyeqf+e94fU6w5+OaChLsmMmYZLVWMZR5P/H3A==","X-Received":"by 2002:a2e:9ac8:: with SMTP id p8mr33347424ljj.79.1556650612144;\n\tTue, 30 Apr 2019 11:56:52 -0700 (PDT)","Date":"Tue, 30 Apr 2019 20:56:50 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190430185650.GR16573@bigcity.dyn.berto.se>","References":"<20190430183746.28518-1-laurent.pinchart@ideasonboard.com>\n\t<20190430183746.28518-4-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190430183746.28518-4-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.11.3 (2019-02-01)","Subject":"Re: [libcamera-devel] [PATCH 3/5] libcamera: pipeline: Unify naming\n\tof configurations in pipeline handlers","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 30 Apr 2019 18:56:53 -0000"}}]