NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

cam: Turn BufferWriter into a FrameSink

Browse source 
Make the BufferWriter class inherit from FrameSink, and use the
FrameSink API to manage it. This makes the code more generic, and will
allow usage of other sinks.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2020-05-19 02:19:47 +03:00
parent f929a2890c
commit 02001fecb0
4 changed files with 104 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/cam/camera_session.cpp
View file

@ -13,6 +13,7 @@
#include <libcamera/control_ids.h>
#include <libcamera/property_ids.h>
#include "buffer_writer.h"
#include "camera_session.h"
#include "event_loop.h"
#include "main.h"
@ -162,9 +163,20 @@ int CameraSession::start()
if (options_.isSet(OptFile)) {
if (!options_[OptFile].toString().empty())
writer_ = std::make_unique<BufferWriter>(options_[OptFile]);
sink_ = std::make_unique<BufferWriter>(options_[OptFile]);
else
writer_ = std::make_unique<BufferWriter>();
sink_ = std::make_unique<BufferWriter>();
}
if (sink_) {
ret = sink_->configure(*config_);
if (ret < 0) {
std::cout << "Failed to configure frame sink"
<< std::endl;
return ret;
}
sink_->requestProcessed.connect(this, &CameraSession::sinkRelease);
}
allocator_ = std::make_unique<FrameBufferAllocator>(camera_);
@ -178,7 +190,13 @@ void CameraSession::stop()
if (ret)
std::cout << "Failed to stop capture" << std::endl;
writer_.reset();
if (sink_) {
ret = sink_->stop();
if (ret)
std::cout << "Failed to stop frame sink" << std::endl;
}
sink_.reset();
requests_.clear();
@ -227,16 +245,26 @@ int CameraSession::startCapture()
return ret;
}
if (writer_)
writer_->mapBuffer(buffer.get());
if (sink_)
sink_->mapBuffer(buffer.get());
}
requests_.push_back(std::move(request));
}
if (sink_) {
ret = sink_->start();
if (ret) {
std::cout << "Failed to start frame sink" << std::endl;
return ret;
}
}
ret = camera_->start();
if (ret) {
std::cout << "Failed to start capture" << std::endl;
if (sink_)
sink_->stop();
return ret;
}
@ -245,6 +273,8 @@ int CameraSession::startCapture()
if (ret < 0) {
std::cerr << "Can't queue request" << std::endl;
camera_->stop();
if (sink_)
sink_->stop();
return ret;
}
}
@ -296,6 +326,8 @@ void CameraSession::processRequest(Request *request)
fps = last_ != 0 && fps ? 1000000000.0 / fps : 0.0;
last_ = ts;
bool requeue = true;
std::stringstream info;
info << ts / 1000000000 << "."
<< std::setw(6) << std::setfill('0') << ts / 1000 % 1000000
@ -304,11 +336,10 @@ void CameraSession::processRequest(Request *request)
for (auto it = buffers.begin(); it != buffers.end(); ++it) {
const Stream *stream = it->first;
FrameBuffer *buffer = it->second;
const std::string &name = streamName_[stream];
const FrameMetadata &metadata = buffer->metadata();
info << " " << name
info << " " << streamName_[stream]
<< " seq: " << std::setw(6) << std::setfill('0') << metadata.sequence
<< " bytesused: ";
@ -318,9 +349,11 @@ void CameraSession::processRequest(Request *request)
if (++nplane < metadata.planes.size())
info << "/";
}
}
if (writer_)
writer_->write(buffer, name);
if (sink_) {
if (!sink_->processRequest(request))
requeue = false;
}
std::cout << info.str() << std::endl;
@ -340,6 +373,19 @@ void CameraSession::processRequest(Request *request)
return;
}
/*
* If the frame sink holds on the request, we'll requeue it later in the
* complete handler.
*/
if (!requeue)
return;
request->reuse(Request::ReuseBuffers);
camera_->queueRequest(request);
}
void CameraSession::sinkRelease(Request *request)
{
request->reuse(Request::ReuseBuffers);
queueRequest(request);
}