[libcamera-devel] [PATCH v7 2/8] libcamera: camera: Reset basefield to decimal

Jacopo Mondi jacopo at jmondi.org
Fri Apr 19 12:18:33 CEST 2019


When logging the camera configuration, the same ostringstream instance
is used to assemble a message describing configuration of all the
configured streams.

After the first stream configuration has been assembled, the use of
std::hex modifies the ostringstream basefield, causing all successive
integers values inserted in the stream to be expressed as hexadecimals.

Fix that by resetting the stream's basefield to decimal, before
assembling a stream configuration description.

Before this patch:
INFO Camera camera.cpp:615  (0) 640x480-0x3231564e (1) 140xa0-0x3231564e
After this patch:
INFO Camera camera.cpp:616  (0) 640x480-0x3231564e (1) 320x160-0x3231564e

Fixes: 9c9078133216 ("libcamera: camera: Log requested configuration in configureStreams()")
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
 src/libcamera/camera.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index bd381fa1cb56..4af3780d305e 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -605,6 +605,7 @@ int Camera::configureStreams(const CameraConfiguration &config)
 			return -EINVAL;
 
 		const StreamConfiguration &cfg = config[stream];
+		msg << std::dec;
 		msg << " (" << index << ") " << cfg.width << "x"
 		    << cfg.height << "-0x" << std::hex << std::setfill('0')
 		    << std::setw(8) << cfg.pixelFormat;
-- 
2.21.0



More information about the libcamera-devel mailing list