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>
This commit is contained in:
@@ -554,7 +554,7 @@ int CameraCapabilities::initializeStreamConfigurations()
|
||||
formatsMap_[androidFormat] = formats::MJPEG;
|
||||
LOG(HAL, Debug) << "Mapped Android format "
|
||||
<< camera3Format.name << " to "
|
||||
<< formats::MJPEG.toString()
|
||||
<< formats::MJPEG
|
||||
<< " (fixed mapping)";
|
||||
continue;
|
||||
}
|
||||
@@ -566,7 +566,7 @@ int CameraCapabilities::initializeStreamConfigurations()
|
||||
PixelFormat mappedFormat;
|
||||
for (const PixelFormat &pixelFormat : libcameraFormats) {
|
||||
|
||||
LOG(HAL, Debug) << "Testing " << pixelFormat.toString();
|
||||
LOG(HAL, Debug) << "Testing " << pixelFormat;
|
||||
|
||||
/*
|
||||
* The stream configuration size can be adjusted,
|
||||
@@ -605,7 +605,7 @@ int CameraCapabilities::initializeStreamConfigurations()
|
||||
formatsMap_[androidFormat] = mappedFormat;
|
||||
LOG(HAL, Debug) << "Mapped Android format "
|
||||
<< camera3Format.name << " to "
|
||||
<< mappedFormat.toString();
|
||||
<< mappedFormat;
|
||||
|
||||
std::vector<Size> resolutions;
|
||||
const PixelFormatInfo &info = PixelFormatInfo::info(mappedFormat);
|
||||
|
||||
@@ -575,7 +575,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
|
||||
<< ", crop_rotate_scale_degrees: "
|
||||
<< rotationToString(stream->crop_rotate_scale_degrees)
|
||||
#endif
|
||||
<< " (" << format.toString() << ")";
|
||||
<< " (" << format << ")";
|
||||
|
||||
if (!format.isValid())
|
||||
return -EINVAL;
|
||||
@@ -926,7 +926,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
|
||||
<< camera3Stream->height << ")"
|
||||
<< "[" << utils::hex(camera3Stream->format) << "] -> "
|
||||
<< "(" << cameraStream->configuration().size << ")["
|
||||
<< cameraStream->configuration().pixelFormat.toString() << "]";
|
||||
<< cameraStream->configuration().pixelFormat << "]";
|
||||
|
||||
/*
|
||||
* Inspect the camera stream type, create buffers opportunely
|
||||
|
||||
@@ -59,7 +59,7 @@ const struct JPEGPixelFormatInfo &findPixelInfo(const PixelFormat &format)
|
||||
const auto iter = pixelInfo.find(format);
|
||||
if (iter == pixelInfo.end()) {
|
||||
LOG(JPEG, Error) << "Unsupported pixel format for JPEG encoder: "
|
||||
<< format.toString();
|
||||
<< format;
|
||||
return invalidPixelFormat;
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ void Thumbnailer::configure(const Size &sourceSize, PixelFormat pixelFormat)
|
||||
if (pixelFormat_ != formats::NV12) {
|
||||
LOG(Thumbnailer, Error)
|
||||
<< "Failed to configure: Pixel Format "
|
||||
<< pixelFormat_.toString() << " unsupported.";
|
||||
<< pixelFormat_ << " unsupported.";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -66,8 +66,7 @@ CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer,
|
||||
const auto &info = PixelFormatInfo::info(pixelFormat);
|
||||
if (!info.isValid()) {
|
||||
error_ = -EINVAL;
|
||||
LOG(HAL, Error) << "Invalid pixel format: "
|
||||
<< pixelFormat.toString();
|
||||
LOG(HAL, Error) << "Invalid pixel format: " << pixelFormat;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -27,8 +27,8 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg,
|
||||
{
|
||||
if (inCfg.pixelFormat != outCfg.pixelFormat) {
|
||||
LOG(YUV, Error) << "Pixel format conversion is not supported"
|
||||
<< " (from " << inCfg.pixelFormat.toString()
|
||||
<< " to " << outCfg.pixelFormat.toString() << ")";
|
||||
<< " (from " << inCfg.pixelFormat
|
||||
<< " to " << outCfg.pixelFormat << ")";
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user