From 0af0fb9ca9eae903cc533a05e2282ec36cc3ce55 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 18 Apr 2019 18:32:32 +0300
Subject: libcamera: stream: Add and use toString() method to
 StreamConfiguration

Add a toString() method to the StreamConfiguration class, and replace
all manually coded implementations through the source code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/camera.cpp                 |  4 +---
 src/libcamera/pipeline/ipu3/ipu3.cpp     |  5 +----
 src/libcamera/pipeline/rkisp1/rkisp1.cpp | 10 ++--------
 src/libcamera/stream.cpp                 | 19 +++++++++++++++++++
 4 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'src/libcamera')

diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index 69406b51..a5276962 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -596,9 +596,7 @@ int Camera::configureStreams(const CameraConfiguration &config)
 			return -EINVAL;
 
 		const StreamConfiguration &cfg = config[stream];
-		msg << " (" << index << ") " << cfg.width << "x"
-		    << cfg.height << "-0x" << std::hex << std::setfill('0')
-		    << std::setw(8) << cfg.pixelFormat;
+		msg << " (" << index << ") " << cfg.toString();
 
 		index++;
 	}
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 405d6548..7443224d 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -224,10 +224,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,
 	config->pixelFormat = V4L2_PIX_FMT_NV12;
 	config->bufferCount = IPU3_BUFFER_COUNT;
 
-	LOG(IPU3, Debug)
-		<< "Stream format set to " << config->width << "x"
-		<< config->height << "-0x" << std::hex << std::setfill('0')
-		<< std::setw(8) << config->pixelFormat;
+	LOG(IPU3, Debug) << "Stream format set to " << config->toString();
 
 	return configs;
 }
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 51f00fb6..d21c6266 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -124,10 +124,7 @@ CameraConfiguration PipelineHandlerRkISP1::streamConfiguration(Camera *camera,
 
 	configs[&data->stream_] = config;
 
-	LOG(RkISP1, Debug)
-		<< "Stream format set to " << config.width << "x"
-		<< config.height << "-0x" << std::hex << std::setfill('0')
-		<< std::setw(8) << config.pixelFormat;
+	LOG(RkISP1, Debug) << "Stream format set to " << config.toString();
 
 	return configs;
 }
@@ -234,10 +231,7 @@ int PipelineHandlerRkISP1::configureStreams(Camera *camera,
 	    outputFormat.height != cfg.height ||
 	    outputFormat.fourcc != cfg.pixelFormat) {
 		LOG(RkISP1, Error)
-			<< "Unable to configure capture in " << cfg.width
-			<< "x" << cfg.height << "-0x"
-			<< std::hex << std::setfill('0') << std::setw(8)
-			<< cfg.pixelFormat;
+			<< "Unable to configure capture in " << cfg.toString();
 		return -EINVAL;
 	}
 
diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp
index d4ef506c..1668b67d 100644
--- a/src/libcamera/stream.cpp
+++ b/src/libcamera/stream.cpp
@@ -5,6 +5,9 @@
  * stream.cpp - Video stream for a Camera
  */
 
+#include <iomanip>
+#include <sstream>
+
 #include <libcamera/stream.h>
 
 /**
@@ -60,6 +63,22 @@ namespace libcamera {
  * \brief Requested number of buffers to allocate for the stream
  */
 
+/**
+ * \brief Assemble and return a string describing the configuration
+ *
+ * \return A string describing the StreamConfiguration
+ */
+std::string StreamConfiguration::toString() const
+{
+	std::stringstream ss;
+
+	ss.fill(0);
+	ss << width << "x" << height << "-0x" << std::hex
+	   << std::setw(8) << pixelFormat;
+
+	return ss.str();
+}
+
 /**
  * \class StreamUsage
  * \brief Stream usage information
-- 
cgit v1.2.1