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:25 +0300 |
| commit | 37958dfd713dd00d4a71a78a6a45f8016ad82e65 (patch) | |
| tree | c8f958dc5a9877d6d6afe95bcf8e960e3ca1f722 /src/libcamera/pipeline/simple | |
| parent | 4f1d1a48fe7ebe1282d7608a59cb059e1367e584 (diff) | |
libcamera: Replace toString with operator<<() for geometry classes
Now that geometry 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>
Diffstat (limited to 'src/libcamera/pipeline/simple')
| -rw-r--r-- | src/libcamera/pipeline/simple/converter.cpp | 2 | ||||
| -rw-r--r-- | src/libcamera/pipeline/simple/simple.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 9cbc6ee3..ee8376de 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -65,7 +65,7 @@ int SimpleConverter::Stream::configure(const StreamConfiguration &inputCfg, format.planes[0].bpl != inputCfg.stride) { LOG(SimplePipeline, Error) << "Input format not supported (requested " - << inputCfg.size.toString() << "-" << videoFormat.toString() + << inputCfg.size << "-" << videoFormat.toString() << ", got " << format.toString() << ")"; return -EINVAL; } diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index ece821bf..e76bf012 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -474,7 +474,7 @@ int SimpleCameraData::init() video_->formats(format.mbus_code); LOG(SimplePipeline, Debug) - << "Adding configuration for " << format.size.toString() + << "Adding configuration for " << format.size << " in pixel formats [ " << utils::join(videoFormats, ", ", [](const auto &f) { @@ -808,8 +808,8 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() if (!pipeConfig_->outputSizes.contains(cfg.size)) { LOG(SimplePipeline, Debug) - << "Adjusting size from " << cfg.size.toString() - << " to " << pipeConfig_->captureSize.toString(); + << "Adjusting size from " << cfg.size + << " to " << pipeConfig_->captureSize; cfg.size = pipeConfig_->captureSize; status = Adjusted; } @@ -939,7 +939,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) captureFormat.size != pipeConfig->captureSize) { LOG(SimplePipeline, Error) << "Unable to configure capture in " - << pipeConfig->captureSize.toString() << "-" + << pipeConfig->captureSize << "-" << videoFormat.toString(); return -EINVAL; } |