Patch Detail
Show a patch.
GET /api/1.1/patches/1143/?format=api
{ "id": 1143, "url": "https://patchwork.libcamera.org/api/1.1/patches/1143/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1143/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190430183746.28518-4-laurent.pinchart@ideasonboard.com>", "date": "2019-04-30T18:37:44", "name": "[libcamera-devel,3/5] libcamera: pipeline: Unify naming of configurations in pipeline handlers", "commit_ref": "3fc0189e209738f3119fbce62221aa2cc6afc8f2", "pull_url": null, "state": "accepted", "archived": false, "hash": "df6e793f468a97f17a097018de0c63d3904749f5", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1143/mbox/", "series": [ { "id": 285, "url": "https://patchwork.libcamera.org/api/1.1/series/285/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=285", "date": "2019-04-30T18:37:41", "name": "Miscellaneous cleanups and refactoring", "version": 1, "mbox": "https://patchwork.libcamera.org/series/285/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1143/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1143/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A2CB660E5B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Apr 2019 20:38:02 +0200 (CEST)", "from pendragon.station (net-37-182-44-227.cust.vodafonedsl.it\n\t[37.182.44.227])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4CE5931D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Apr 2019 20:38:02 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1556649482;\n\tbh=Vl4wA9p3EhrwJPYSsXEmrxDjsVWt4xcdAm3kiP98Z00=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=GhlIkn97IZYaa1zHC57p0486p8DOKwjOVAF7SlMEuBH6bxiyj1tcHsd8YlifGqYRO\n\t8SPPKWk9T3aWg0QYkrBukMnLwzthi1rrXpAXtohSe77ZYud/z1iOaq38LtLimwiEAJ\n\tZbhrrC2RwcC4/NfCOFaNneW4nFHA2a53oqyVTrw8=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "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", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 3/5] libcamera: pipeline: Unify naming of\n\tconfigurations in pipeline handlers", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Tue, 30 Apr 2019 18:38:03 -0000" }, "content": "Name all instances of CameraConfiguration \"config\", and all instances of\nStreamConfiguration \"cfg\" accross all pipeline handlers.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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(-)", "diff": "diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 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 \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 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<StreamUsage> &usages)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tCameraConfiguration cameraConfig = {};\n+\tCameraConfiguration config = {};\n \tstd::set<IPU3Stream *> 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);\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 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<StreamUsage> &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,\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 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<StreamUsage> &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,\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 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<StreamUsage> &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,\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 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", "prefixes": [ "libcamera-devel", "3/5" ] }