[libcamera-devel,2/2] libcamera: Remove buffer index from logging

2430 diff mbox series

diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp
index e665d819fb777a90..4b65b1d0a2dbed35 100644
--- a/src/cam/capture.cpp
+++ b/src/cam/capture.cpp
@@ -155,7 +155,6 @@  void Capture::requestComplete(Request *request)
 		const std::string &name = streamName_[stream];
 
 		info << " " << name
-		     << " (" << buffer->index() << ")"
 		     << " seq: " << std::setw(6) << std::setfill('0') << buffer->sequence()
 		     << " bytesused: " << buffer->bytesused();
 
@@ -182,7 +181,7 @@  void Capture::requestComplete(Request *request)
 
 		std::unique_ptr<Buffer> newBuffer = stream->createBuffer(index);
 		if (!newBuffer) {
-			std::cerr << "Can't create buffer " << index << std::endl;
+			std::cerr << "Can't create buffer" << std::endl;
 			return;
 		}
 
diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp
index 992130751286994c..13e023237dab0daf 100644
--- a/src/libcamera/v4l2_videodevice.cpp
+++ b/src/libcamera/v4l2_videodevice.cpp
@@ -1102,6 +1102,7 @@  Buffer *V4L2VideoDevice::dequeueBuffer()
 		return nullptr;
 	}
 
+	LOG(V4L2, Debug) << "Dequeuing buffer " << buf.index;
 	ASSERT(buf.index < bufferPool_->count());
 
 	auto it = queuedBuffers_.find(buf.index);
@@ -1138,8 +1139,6 @@  void V4L2VideoDevice::bufferAvailable(EventNotifier *notifier)
 	if (!buffer)
 		return;
 
-	LOG(V4L2, Debug) << "Buffer " << buffer->index() << " is available";
-
 	/* Notify anyone listening to the device. */
 	bufferReady.emit(buffer);
 }
diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
index cca7365ae75687f9..0c7ca61ac12ec41c 100644
--- a/src/qcam/main_window.cpp
+++ b/src/qcam/main_window.cpp
@@ -264,7 +264,6 @@  void MainWindow::requestComplete(Request *request)
 	lastBufferTime_ = buffer->timestamp();
 
 	std::cout << "seq: " << std::setw(6) << std::setfill('0') << buffer->sequence()
-		  << " buf: " << buffer->index()
 		  << " bytesused: " << buffer->bytesused()
 		  << " timestamp: " << buffer->timestamp()
 		  << " fps: " << std::fixed << std::setprecision(2) << fps
@@ -285,7 +284,7 @@  void MainWindow::requestComplete(Request *request)
 
 		std::unique_ptr<Buffer> newBuffer = stream->createBuffer(index);
 		if (!newBuffer) {
-			std::cerr << "Can't create buffer " << index << std::endl;
+			std::cerr << "Can't create buffer" << std::endl;
 			return;
 		}
 
diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp
index 1629f34cfa6c79fe..3a56862cb2b77d38 100644
--- a/test/v4l2_videodevice/buffer_sharing.cpp
+++ b/test/v4l2_videodevice/buffer_sharing.cpp
@@ -92,8 +92,7 @@  protected:
 
 	void captureBufferReady(Buffer *buffer)
 	{
-		std::cout << "Received capture buffer: " << buffer->index()
-			  << " sequence " << buffer->sequence() << std::endl;
+		std::cout << "Received capture buffer" << std::endl;
 
 		if (buffer->status() != Buffer::BufferSuccess)
 			return;
@@ -104,8 +103,7 @@  protected:
 
 	void outputBufferReady(Buffer *buffer)
 	{
-		std::cout << "Received output buffer: " << buffer->index()
-			  << " sequence " << buffer->sequence() << std::endl;
+		std::cout << "Received output buffer" << std::endl;
 
 		if (buffer->status() != Buffer::BufferSuccess)
 			return;
diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp
index 442a4fe56eace57e..f62bbd837b213a0a 100644
--- a/test/v4l2_videodevice/capture_async.cpp
+++ b/test/v4l2_videodevice/capture_async.cpp
@@ -22,7 +22,7 @@  public:
 
 	void receiveBuffer(Buffer *buffer)
 	{
-		std::cout << "Received buffer " << buffer->index() << std::endl;
+		std::cout << "Buffer received" << std::endl;
 		frames++;
 
 		/* Requeue the buffer for further use. */
diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp
index 4d3644c2d28792f1..442bcac5dc49cc59 100644
--- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp
+++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp
@@ -31,7 +31,7 @@  public:
 
 	void outputBufferComplete(Buffer *buffer)
 	{
-		cout << "Received output buffer " << buffer->index() << endl;
+		cout << "Received output buffer" << endl;
 
 		outputFrames_++;
 
@@ -41,7 +41,7 @@  public:
 
 	void receiveCaptureBuffer(Buffer *buffer)
 	{
-		cout << "Received capture buffer " << buffer->index() << endl;
+		cout << "Received capture buffer" << endl;
 
 		captureFrames_++;