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/android | |
| 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/android')
| -rw-r--r-- | src/android/camera_capabilities.cpp | 6 | ||||
| -rw-r--r-- | src/android/camera_device.cpp | 2 | ||||
| -rw-r--r-- | src/android/yuv/post_processor_yuv.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 55d651f3..e06a517d 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -487,7 +487,7 @@ int CameraCapabilities::initializeStreamConfigurations() * JPEG encoder requirements into account (alignment and aspect ratio). */ const Size maxRes = cfg.size; - LOG(HAL, Debug) << "Maximum supported resolution: " << maxRes.toString(); + LOG(HAL, Debug) << "Maximum supported resolution: " << maxRes; /* * Build the list of supported image resolutions. @@ -729,7 +729,7 @@ int CameraCapabilities::initializeStreamConfigurations() LOG(HAL, Debug) << "Collected stream configuration map: "; for (const auto &entry : streamConfigurations_) - LOG(HAL, Debug) << "{ " << entry.resolution.toString() << " - " + LOG(HAL, Debug) << "{ " << entry.resolution << " - " << utils::hex(entry.androidFormat) << " }"; return 0; @@ -1321,7 +1321,7 @@ int CameraCapabilities::initializeStaticMetadata() LOG(HAL, Debug) << "Output Stream: " << utils::hex(entry.androidFormat) - << " (" << entry.resolution.toString() << ")[" + << " (" << entry.resolution << ")[" << entry.minFrameDurationNsec << "]" << "@" << fps; } diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 00d48471..f7ec95eb 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -925,7 +925,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques ss << i << " - (" << camera3Stream->width << "x" << camera3Stream->height << ")" << "[" << utils::hex(camera3Stream->format) << "] -> " - << "(" << cameraStream->configuration().size.toString() << ")[" + << "(" << cameraStream->configuration().size << ")[" << cameraStream->configuration().pixelFormat.toString() << "]"; /* diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp index 9f883924..513c6ef8 100644 --- a/src/android/yuv/post_processor_yuv.cpp +++ b/src/android/yuv/post_processor_yuv.cpp @@ -34,8 +34,8 @@ int PostProcessorYuv::configure(const StreamConfiguration &inCfg, if (inCfg.size < outCfg.size) { LOG(YUV, Error) << "Up-scaling is not supported" - << " (from " << inCfg.size.toString() - << " to " << outCfg.size.toString() << ")"; + << " (from " << inCfg.size + << " to " << outCfg.size << ")"; return -EINVAL; } |