libcamera: Remove buffer index from logging
The buffer index is a V4L2 concept that will be hidden from users with the introduction of a new FrameBuffer class. In preparation for this, remove the index from log messages. Keep and move one debug log message where the index is available as the V4L2 buffer is being dequeued for the video device and it's useful when debugging. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
parent
3de65b43a6
commit
89dc54af09
6 changed files with 8 additions and 13 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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_++;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue