Patch Detail
Show a patch.
GET /api/1.1/patches/15749/?format=api
{ "id": 15749, "url": "https://patchwork.libcamera.org/api/1.1/patches/15749/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15749/", "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": "<20220429010441.27110-1-laurent.pinchart@ideasonboard.com>", "date": "2022-04-29T01:04:41", "name": "[libcamera-devel] libcamera: Replace toString with operator<<() for geometry classes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "efac79c26fb554d55db84a67503f35bbab026d5a", "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/15749/mbox/", "series": [ { "id": 3082, "url": "https://patchwork.libcamera.org/api/1.1/series/3082/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3082", "date": "2022-04-29T01:04:41", "name": "[libcamera-devel] libcamera: Replace toString with operator<<() for geometry classes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3082/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15749/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15749/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1A9C3C3256\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 29 Apr 2022 01:04:52 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 720EF65640;\n\tFri, 29 Apr 2022 03:04:51 +0200 (CEST)", "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 0EB47604A4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 29 Apr 2022 03:04:50 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 63A60496;\n\tFri, 29 Apr 2022 03:04:49 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651194291;\n\tbh=o5znJPcgtuy8NXN1lSJ3CCc7pOgYmBOaR3sNQ2pe/W8=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=TkIPHjItGnsHGCHt3Y7+rAOiSigFig5ENC5ZFknnrIF0uWyEXhnNUeMr4JHtpSkSG\n\twGJRzJT1t0BzNh5LKjMM/236dHbSeMve+zmv+OD0HyuNSwrbSZ+M8Njk0hJb6UWS1U\n\tToUAXNTlHVFZrbOMt+LhXktpztXGT36NWPFNHi1UGDn+TvxmKx5/hvzdcIH2sKdsl/\n\tlRgBcXxfzpDv9/F7ZS7a4yUFPH1bVclhAOj/ONKaoI+Y7IK06wUIP1M7PUxMh0955C\n\tEUFg/w3i1Y3wWSneEzTVvG+YLl0uM8LBeUnGQzymjfl+d3M7hTuwYvQavr2iOu2v4z\n\tt6+5j6UaWmGRQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1651194289;\n\tbh=o5znJPcgtuy8NXN1lSJ3CCc7pOgYmBOaR3sNQ2pe/W8=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=XvKkdAQMQJcvKUOGt1gvRrBDMqRCq09pUZg5gZZkAeoc4aFoRGzTdne0QN5SXHQQP\n\twwfD1xiLiZfdmBGPmFyKEkdWPjIFCyLgTsWxVN261Vn/bhv392RHrfkKKTY4NQKZHb\n\tv+TSQ5VlmwzS9+Cde/G5hlMPFVkL0ZmgBnlCgStI=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"XvKkdAQM\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 29 Apr 2022 04:04:41 +0300", "Message-Id": "<20220429010441.27110-1-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] libcamera: Replace toString with\n\toperator<<() for geometry classes", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Now that geometry classes implement the stream formatting operator<<(),\nuse it instead of the toString() function.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/android/camera_capabilities.cpp | 6 +++---\n src/android/camera_device.cpp | 2 +-\n src/android/yuv/post_processor_yuv.cpp | 4 ++--\n src/cam/camera_session.cpp | 3 +--\n src/cam/kms_sink.cpp | 4 +---\n src/libcamera/camera_sensor.cpp | 4 ++--\n src/libcamera/pipeline/ipu3/imgu.cpp | 19 +++++++++----------\n .../pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +++---\n src/libcamera/pipeline/simple/converter.cpp | 2 +-\n src/libcamera/pipeline/simple/simple.cpp | 8 ++++----\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 3 +--\n src/libcamera/pipeline/vimc/vimc.cpp | 2 +-\n src/libcamera/v4l2_subdevice.cpp | 2 +-\n src/libcamera/v4l2_videodevice.cpp | 2 +-\n test/camera-sensor.cpp | 3 +--\n test/geometry.cpp | 4 +---\n test/stream/stream_formats.cpp | 4 ++--\n 18 files changed, 36 insertions(+), 44 deletions(-)\n\n\nbase-commit: dc7fc90573b99bbc6d21a25a741891471d68f274", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 55d651f38870..e06a517d84b8 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -487,7 +487,7 @@ int CameraCapabilities::initializeStreamConfigurations()\n \t * JPEG encoder requirements into account (alignment and aspect ratio).\n \t */\n \tconst Size maxRes = cfg.size;\n-\tLOG(HAL, Debug) << \"Maximum supported resolution: \" << maxRes.toString();\n+\tLOG(HAL, Debug) << \"Maximum supported resolution: \" << maxRes;\n \n \t/*\n \t * Build the list of supported image resolutions.\n@@ -729,7 +729,7 @@ int CameraCapabilities::initializeStreamConfigurations()\n \n \tLOG(HAL, Debug) << \"Collected stream configuration map: \";\n \tfor (const auto &entry : streamConfigurations_)\n-\t\tLOG(HAL, Debug) << \"{ \" << entry.resolution.toString() << \" - \"\n+\t\tLOG(HAL, Debug) << \"{ \" << entry.resolution << \" - \"\n \t\t\t\t<< utils::hex(entry.androidFormat) << \" }\";\n \n \treturn 0;\n@@ -1321,7 +1321,7 @@ int CameraCapabilities::initializeStaticMetadata()\n \n \t\tLOG(HAL, Debug)\n \t\t\t<< \"Output Stream: \" << utils::hex(entry.androidFormat)\n-\t\t\t<< \" (\" << entry.resolution.toString() << \")[\"\n+\t\t\t<< \" (\" << entry.resolution << \")[\"\n \t\t\t<< entry.minFrameDurationNsec << \"]\"\n \t\t\t<< \"@\" << fps;\n \t}\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 00d484716045..f7ec95eb720e 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -925,7 +925,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tss << i << \" - (\" << camera3Stream->width << \"x\"\n \t\t << camera3Stream->height << \")\"\n \t\t << \"[\" << utils::hex(camera3Stream->format) << \"] -> \"\n-\t\t << \"(\" << cameraStream->configuration().size.toString() << \")[\"\n+\t\t << \"(\" << cameraStream->configuration().size << \")[\"\n \t\t << cameraStream->configuration().pixelFormat.toString() << \"]\";\n \n \t\t/*\ndiff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\nindex 9f88392476f1..513c6ef86153 100644\n--- a/src/android/yuv/post_processor_yuv.cpp\n+++ b/src/android/yuv/post_processor_yuv.cpp\n@@ -34,8 +34,8 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,\n \n \tif (inCfg.size < outCfg.size) {\n \t\tLOG(YUV, Error) << \"Up-scaling is not supported\"\n-\t\t\t\t<< \" (from \" << inCfg.size.toString()\n-\t\t\t\t<< \" to \" << outCfg.size.toString() << \")\";\n+\t\t\t\t<< \" (from \" << inCfg.size\n+\t\t\t\t<< \" to \" << outCfg.size << \")\";\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 0428b5386537..bacb42561560 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -150,8 +150,7 @@ void CameraSession::infoConfiguration() const\n \t\t\t\t << std::endl;\n \n \t\t\tfor (const Size &size : formats.sizes(pixelformat))\n-\t\t\t\tstd::cout << \" - \" << size.toString()\n-\t\t\t\t\t << std::endl;\n+\t\t\t\tstd::cout << \" - \" << size << std::endl;\n \t\t}\n \n \t\tindex++;\ndiff --git a/src/cam/kms_sink.cpp b/src/cam/kms_sink.cpp\nindex da579846fd8e..29be5623cb17 100644\n--- a/src/cam/kms_sink.cpp\n+++ b/src/cam/kms_sink.cpp\n@@ -119,9 +119,7 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config)\n \t\t\t\t\t\t mode.vdisplay == cfg.size.height;\n \t\t\t\t });\n \tif (iter == modes.end()) {\n-\t\tstd::cerr\n-\t\t\t<< \"No mode matching \" << cfg.size.toString()\n-\t\t\t<< std::endl;\n+\t\tstd::cerr << \"No mode matching \" << cfg.size << std::endl;\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex eaa2da6bad32..4bb2066f0fd4 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -238,7 +238,7 @@ int CameraSensor::validateSensorDriver()\n \n \t\tLOG(CameraSensor, Warning)\n \t\t\t<< \"The PixelArraySize property has been defaulted to \"\n-\t\t\t<< pixelArraySize_.toString();\n+\t\t\t<< pixelArraySize_;\n \t\terr = -EINVAL;\n \t} else {\n \t\tpixelArraySize_ = rect.size();\n@@ -249,7 +249,7 @@ int CameraSensor::validateSensorDriver()\n \t\tactiveArea_ = Rectangle(pixelArraySize_);\n \t\tLOG(CameraSensor, Warning)\n \t\t\t<< \"The PixelArrayActiveAreas property has been defaulted to \"\n-\t\t\t<< activeArea_.toString();\n+\t\t\t<< activeArea_;\n \t\terr = -EINVAL;\n \t}\n \ndiff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex e5bbc3829c68..3ac997cc1acf 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -386,9 +386,9 @@ ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)\n \tpipeConfigs.clear();\n \n \tLOG(IPU3, Debug) << \"Calculating pipe configuration for: \";\n-\tLOG(IPU3, Debug) << \"input: \" << pipe->input.toString();\n-\tLOG(IPU3, Debug) << \"main: \" << pipe->main.toString();\n-\tLOG(IPU3, Debug) << \"vf: \" << pipe->viewfinder.toString();\n+\tLOG(IPU3, Debug) << \"input: \" << pipe->input;\n+\tLOG(IPU3, Debug) << \"main: \" << pipe->main;\n+\tLOG(IPU3, Debug) << \"vf: \" << pipe->viewfinder;\n \n \tconst Size &in = pipe->input;\n \n@@ -397,8 +397,7 @@ ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)\n \t * See https://bugs.libcamera.org/show_bug.cgi?id=32\n \t */\n \tif (in.width < ImgUDevice::kIFMaxCropWidth || in.height < ImgUDevice::kIFMaxCropHeight) {\n-\t\tLOG(IPU3, Error) << \"Input resolution \" << in.toString()\n-\t\t\t\t << \" not supported\";\n+\t\tLOG(IPU3, Error) << \"Input resolution \" << in << \" not supported\";\n \t\treturn {};\n \t}\n \n@@ -460,9 +459,9 @@ ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)\n \t}\n \n \tLOG(IPU3, Debug) << \"Computed pipe configuration: \";\n-\tLOG(IPU3, Debug) << \"IF: \" << pipeConfigs[bestIndex].iif.toString();\n-\tLOG(IPU3, Debug) << \"BDS: \" << pipeConfigs[bestIndex].bds.toString();\n-\tLOG(IPU3, Debug) << \"GDC: \" << pipeConfigs[bestIndex].gdc.toString();\n+\tLOG(IPU3, Debug) << \"IF: \" << pipeConfigs[bestIndex].iif;\n+\tLOG(IPU3, Debug) << \"BDS: \" << pipeConfigs[bestIndex].bds;\n+\tLOG(IPU3, Debug) << \"GDC: \" << pipeConfigs[bestIndex].gdc;\n \n \treturn pipeConfigs[bestIndex];\n }\n@@ -496,13 +495,13 @@ int ImgUDevice::configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputF\n \tret = imgu_->setSelection(PAD_INPUT, V4L2_SEL_TGT_CROP, &iif);\n \tif (ret)\n \t\treturn ret;\n-\tLOG(IPU3, Debug) << \"ImgU IF rectangle = \" << iif.toString();\n+\tLOG(IPU3, Debug) << \"ImgU IF rectangle = \" << iif;\n \n \tRectangle bds{ 0, 0, pipeConfig.bds };\n \tret = imgu_->setSelection(PAD_INPUT, V4L2_SEL_TGT_COMPOSE, &bds);\n \tif (ret)\n \t\treturn ret;\n-\tLOG(IPU3, Debug) << \"ImgU BDS rectangle = \" << bds.toString();\n+\tLOG(IPU3, Debug) << \"ImgU BDS rectangle = \" << bds;\n \n \tV4L2SubdeviceFormat gdcFormat = {};\n \tgdcFormat.mbus_code = MEDIA_BUS_FMT_FIXED;\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex acc0becaa5c0..d8c709b7a503 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -166,7 +166,7 @@ V4L2SubdeviceFormat findBestFormat(const SensorFormats &formatsMap, const Size &\n \t\t\t\tbestFormat.size = size;\n \t\t\t}\n \n-\t\t\tLOG(RPI, Debug) << \"Format: \" << size.toString()\n+\t\t\tLOG(RPI, Debug) << \"Format: \" << size\n \t\t\t\t\t<< \" fmt \" << format.toString()\n \t\t\t\t\t<< \" Score: \" << score\n \t\t\t\t\t<< \" (best \" << bestScore << \")\";\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 1624e2ecc5a0..1c53495c97cc 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -592,13 +592,13 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \n \tLOG(RkISP1, Debug)\n \t\t<< \"ISP input pad configured with \" << format.toString()\n-\t\t<< \" crop \" << rect.toString();\n+\t\t<< \" crop \" << rect;\n \n \t/* YUYV8_2X8 is required on the ISP source path pad for YUV output. */\n \tformat.mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;\n \tLOG(RkISP1, Debug)\n \t\t<< \"Configuring ISP output pad with \" << format.toString()\n-\t\t<< \" crop \" << rect.toString();\n+\t\t<< \" crop \" << rect;\n \n \tret = isp_->setSelection(2, V4L2_SEL_TGT_CROP, &rect);\n \tif (ret < 0)\n@@ -610,7 +610,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \n \tLOG(RkISP1, Debug)\n \t\t<< \"ISP output pad configured with \" << format.toString()\n-\t\t<< \" crop \" << rect.toString();\n+\t\t<< \" crop \" << rect;\n \n \tstd::map<unsigned int, IPAStream> streamConfig;\n \ndiff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\nindex 9cbc6ee30ce4..ee8376dea1e0 100644\n--- a/src/libcamera/pipeline/simple/converter.cpp\n+++ b/src/libcamera/pipeline/simple/converter.cpp\n@@ -65,7 +65,7 @@ int SimpleConverter::Stream::configure(const StreamConfiguration &inputCfg,\n \t format.planes[0].bpl != inputCfg.stride) {\n \t\tLOG(SimplePipeline, Error)\n \t\t\t<< \"Input format not supported (requested \"\n-\t\t\t<< inputCfg.size.toString() << \"-\" << videoFormat.toString()\n+\t\t\t<< inputCfg.size << \"-\" << videoFormat.toString()\n \t\t\t<< \", got \" << format.toString() << \")\";\n \t\treturn -EINVAL;\n \t}\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex ece821bfe978..e76bf01261b0 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -474,7 +474,7 @@ int SimpleCameraData::init()\n \t\t\tvideo_->formats(format.mbus_code);\n \n \t\tLOG(SimplePipeline, Debug)\n-\t\t\t<< \"Adding configuration for \" << format.size.toString()\n+\t\t\t<< \"Adding configuration for \" << format.size\n \t\t\t<< \" in pixel formats [ \"\n \t\t\t<< utils::join(videoFormats, \", \",\n \t\t\t\t [](const auto &f) {\n@@ -808,8 +808,8 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \n \t\tif (!pipeConfig_->outputSizes.contains(cfg.size)) {\n \t\t\tLOG(SimplePipeline, Debug)\n-\t\t\t\t<< \"Adjusting size from \" << cfg.size.toString()\n-\t\t\t\t<< \" to \" << pipeConfig_->captureSize.toString();\n+\t\t\t\t<< \"Adjusting size from \" << cfg.size\n+\t\t\t\t<< \" to \" << pipeConfig_->captureSize;\n \t\t\tcfg.size = pipeConfig_->captureSize;\n \t\t\tstatus = Adjusted;\n \t\t}\n@@ -939,7 +939,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \t captureFormat.size != pipeConfig->captureSize) {\n \t\tLOG(SimplePipeline, Error)\n \t\t\t<< \"Unable to configure capture in \"\n-\t\t\t<< pipeConfig->captureSize.toString() << \"-\"\n+\t\t\t<< pipeConfig->captureSize << \"-\"\n \t\t\t<< videoFormat.toString();\n \t\treturn -EINVAL;\n \t}\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 40654a0bc40c..e5a79417f923 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -143,8 +143,7 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \n \tif (cfg.size != size) {\n \t\tLOG(UVC, Debug)\n-\t\t\t<< \"Adjusting size from \" << size.toString()\n-\t\t\t<< \" to \" << cfg.size.toString();\n+\t\t\t<< \"Adjusting size from \" << size << \" to \" << cfg.size;\n \t\tstatus = Adjusted;\n \t}\n \ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex c3e33ecf048c..3db0ffe58c39 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -164,7 +164,7 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()\n \n \tif (cfg.size != size) {\n \t\tLOG(VIMC, Debug)\n-\t\t\t<< \"Adjusting size to \" << cfg.size.toString();\n+\t\t\t<< \"Adjusting size to \" << cfg.size;\n \t\tstatus = Adjusted;\n \t}\n \ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex fa216e85fde9..d5ae460571d8 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -191,7 +191,7 @@ const std::map<uint32_t, V4L2SubdeviceFormatInfo> formatInfoMap = {\n const std::string V4L2SubdeviceFormat::toString() const\n {\n \tstd::stringstream mbus;\n-\tmbus << size.toString() << \"-\";\n+\tmbus << size << \"-\";\n \n \tconst auto it = formatInfoMap.find(mbus_code);\n \ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 05d3273ebb58..5ba866ad71bb 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -433,7 +433,7 @@ bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const\n const std::string V4L2DeviceFormat::toString() const\n {\n \tstd::stringstream ss;\n-\tss << size.toString() << \"-\" << fourcc.toString();\n+\tss << size << \"-\" << fourcc.toString();\n \treturn ss.str();\n }\n \ndiff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp\nindex 372ee4aff69b..9b06a60e7695 100644\n--- a/test/camera-sensor.cpp\n+++ b/test/camera-sensor.cpp\n@@ -86,8 +86,7 @@ protected:\n \n \t\tconst Size &resolution = sensor_->resolution();\n \t\tif (resolution != Size(4096, 2160)) {\n-\t\t\tcerr << \"Incorrect sensor resolution \"\n-\t\t\t << resolution.toString() << endl;\n+\t\t\tcerr << \"Incorrect sensor resolution \" << resolution << endl;\n \t\t\treturn TestFail;\n \t\t}\n \ndiff --git a/test/geometry.cpp b/test/geometry.cpp\nindex 5125692496b3..008d51eac0dd 100644\n--- a/test/geometry.cpp\n+++ b/test/geometry.cpp\n@@ -25,9 +25,7 @@ protected:\n \t\tbool result = op(lhs, rhs);\n \n \t\tif (result != expect) {\n-\t\t\tcout << lhs.toString()\n-\t\t\t << opName << \" \"\n-\t\t\t << rhs.toString()\n+\t\t\tcout << lhs << opName << \" \" << rhs\n \t\t\t << \"test failed\" << std::endl;\n \t\t\treturn false;\n \t\t}\ndiff --git a/test/stream/stream_formats.cpp b/test/stream/stream_formats.cpp\nindex 9353d0085e19..99fa0385e961 100644\n--- a/test/stream/stream_formats.cpp\n+++ b/test/stream/stream_formats.cpp\n@@ -40,10 +40,10 @@ protected:\n \t\t\tcout << \"Failed \" << name << endl;\n \t\t\tcout << \"Sizes to test:\" << endl;\n \t\t\tfor (Size &size : test)\n-\t\t\t\tcout << size.toString() << endl;\n+\t\t\t\tcout << size << endl;\n \t\t\tcout << \"Valid sizes:\" << endl;\n \t\t\tfor (Size &size : valid)\n-\t\t\t\tcout << size.toString() << endl;\n+\t\t\t\tcout << size << endl;\n \n \t\t\treturn TestFail;\n \t\t}\n", "prefixes": [ "libcamera-devel" ] }