summaryrefslogtreecommitdiff
path: root/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-04-29 03:59:45 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-05-04 14:11:33 +0300
commit8a845ab078c3fe12ac4edd16c8cbac5b7ec03b98 (patch)
tree945c6a147ed76a1f09b36ddc06fbdb44b221f970 /src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
parentd5d6dbe85cf270aee7c956429a5a692feca3900f (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/raspberrypi/raspberrypi.cpp')
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index d8c709b7..e2ee7f1a 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -167,7 +167,7 @@ V4L2SubdeviceFormat findBestFormat(const SensorFormats &formatsMap, const Size &
}
LOG(RPI, Debug) << "Format: " << size
- << " fmt " << format.toString()
+ << " fmt " << format
<< " Score: " << score
<< " (best " << bestScore << ")";
}
@@ -758,8 +758,8 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
return ret;
LOG(RPI, Info) << "Sensor: " << camera->id()
- << " - Selected sensor format: " << sensorFormat.toString()
- << " - Selected unicam format: " << unicamFormat.toString();
+ << " - Selected sensor format: " << sensorFormat
+ << " - Selected unicam format: " << unicamFormat;
ret = data->isp_[Isp::Input].dev()->setFormat(&unicamFormat);
if (ret)
@@ -790,7 +790,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
format.colorSpace = cfg.colorSpace;
LOG(RPI, Debug) << "Setting " << stream->name() << " to "
- << format.toString();
+ << format;
ret = stream->dev()->setFormat(&format);
if (ret)
@@ -799,7 +799,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
if (format.size != cfg.size || format.fourcc != fourcc) {
LOG(RPI, Error)
<< "Failed to set requested format on " << stream->name()
- << ", returned " << format.toString();
+ << ", returned " << format;
return -EINVAL;
}
@@ -842,7 +842,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
}
LOG(RPI, Debug) << "Defaulting ISP Output0 format to "
- << format.toString();
+ << format;
}
/*
@@ -866,7 +866,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
output1Format.fourcc = V4L2PixelFormat::fromPixelFormat(formats::YUV420);
LOG(RPI, Debug) << "Setting ISP Output1 (internal) to "
- << output1Format.toString();
+ << output1Format;
ret = data->isp_[Isp::Output1].dev()->setFormat(&output1Format);
if (ret) {
@@ -882,7 +882,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
ret = data->isp_[Isp::Stats].dev()->setFormat(&format);
if (ret) {
LOG(RPI, Error) << "Failed to set format on ISP stats stream: "
- << format.toString();
+ << format;
return ret;
}
@@ -923,7 +923,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
ret = data->unicam_[Unicam::Embedded].dev()->setFormat(&format);
if (ret) {
LOG(RPI, Error) << "Failed to set format on Unicam embedded: "
- << format.toString();
+ << format;
return ret;
}
}
@@ -965,7 +965,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
if (ret) {
LOG(RPI, Error) << "Failed to set format on " << device->entity()->name()
<< " pad " << sinkPad->index()
- << " with format " << format.toString()
+ << " with format " << format
<< ": " << ret;
return ret;
}