diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-04-29 03:59:45 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-05-04 14:11:33 +0300 |
commit | 8a845ab078c3fe12ac4edd16c8cbac5b7ec03b98 (patch) | |
tree | 945c6a147ed76a1f09b36ddc06fbdb44b221f970 /src/libcamera/pipeline/rkisp1 | |
parent | d5d6dbe85cf270aee7c956429a5a692feca3900f (diff) |
libcamera: Replace toString with operator<<() for format classes
Now that format classes implement the stream formatting operator<<(),
use it instead of the toString() function.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera/pipeline/rkisp1')
-rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 10 | ||||
-rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 1c53495c..7cf36524 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -573,13 +573,13 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) * the pipeline. */ V4L2SubdeviceFormat format = config->sensorFormat(); - LOG(RkISP1, Debug) << "Configuring sensor with " << format.toString(); + LOG(RkISP1, Debug) << "Configuring sensor with " << format; ret = sensor->setFormat(&format); if (ret < 0) return ret; - LOG(RkISP1, Debug) << "Sensor configured with " << format.toString(); + LOG(RkISP1, Debug) << "Sensor configured with " << format; ret = isp_->setFormat(0, &format); if (ret < 0) @@ -591,13 +591,13 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) return ret; LOG(RkISP1, Debug) - << "ISP input pad configured with " << format.toString() + << "ISP input pad configured with " << format << " crop " << rect; /* YUYV8_2X8 is required on the ISP source path pad for YUV output. */ format.mbus_code = MEDIA_BUS_FMT_YUYV8_2X8; LOG(RkISP1, Debug) - << "Configuring ISP output pad with " << format.toString() + << "Configuring ISP output pad with " << format << " crop " << rect; ret = isp_->setSelection(2, V4L2_SEL_TGT_CROP, &rect); @@ -609,7 +609,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) return ret; LOG(RkISP1, Debug) - << "ISP output pad configured with " << format.toString() + << "ISP output pad configured with " << format << " crop " << rect; std::map<unsigned int, IPAStream> streamConfig; diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp index 490d09e4..6f175758 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp @@ -119,13 +119,13 @@ int RkISP1Path::configure(const StreamConfiguration &config, LOG(RkISP1, Debug) << "Configured " << name_ << " resizer input pad with " - << ispFormat.toString() << " crop " << rect; + << ispFormat << " crop " << rect; ispFormat.size = config.size; LOG(RkISP1, Debug) << "Configuring " << name_ << " resizer output pad with " - << ispFormat.toString(); + << ispFormat; switch (config.pixelFormat) { case formats::NV12: @@ -143,7 +143,7 @@ int RkISP1Path::configure(const StreamConfiguration &config, LOG(RkISP1, Debug) << "Configured " << name_ << " resizer output pad with " - << ispFormat.toString(); + << ispFormat; const PixelFormatInfo &info = PixelFormatInfo::info(config.pixelFormat); V4L2DeviceFormat outputFormat; |