The camera session keeps requeuing requests until the capture limit is reached. This causes more request than the limit to complete, as there's a queue of requests in flight. When capturing from multiple cameras concurrently, this results in the captureDone signal being emitted for every request completion after the limit is reached, instead of once per camera session when reaching the limit. Fix this by simply dropping any request that completes after the limit is reached. We could instead avoid requeuing more requests than needed to reach the limit, but that may cause request starvation in pipelines, which are currently not handled consistently (or correctly). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
437 lines
10 KiB
C++
437 lines
10 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* camera_session.cpp - Camera capture session
|
|
*/
|
|
|
|
#include <iomanip>
|
|
#include <iostream>
|
|
#include <limits.h>
|
|
#include <sstream>
|
|
|
|
#include <libcamera/control_ids.h>
|
|
#include <libcamera/property_ids.h>
|
|
|
|
#include "camera_session.h"
|
|
#include "event_loop.h"
|
|
#include "file_sink.h"
|
|
#ifdef HAVE_KMS
|
|
#include "kms_sink.h"
|
|
#endif
|
|
#include "main.h"
|
|
#include "stream_options.h"
|
|
|
|
using namespace libcamera;
|
|
|
|
CameraSession::CameraSession(CameraManager *cm,
|
|
const std::string &cameraId,
|
|
unsigned int cameraIndex,
|
|
const OptionsParser::Options &options)
|
|
: options_(options), cameraIndex_(cameraIndex), last_(0),
|
|
queueCount_(0), captureCount_(0), captureLimit_(0),
|
|
printMetadata_(false)
|
|
{
|
|
char *endptr;
|
|
unsigned long index = strtoul(cameraId.c_str(), &endptr, 10);
|
|
if (*endptr == '\0' && index > 0 && index <= cm->cameras().size())
|
|
camera_ = cm->cameras()[index - 1];
|
|
else
|
|
camera_ = cm->get(cameraId);
|
|
|
|
if (!camera_) {
|
|
std::cerr << "Camera " << cameraId << " not found" << std::endl;
|
|
return;
|
|
}
|
|
|
|
if (camera_->acquire()) {
|
|
std::cerr << "Failed to acquire camera " << cameraId
|
|
<< std::endl;
|
|
return;
|
|
}
|
|
|
|
StreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]);
|
|
|
|
std::unique_ptr<CameraConfiguration> config =
|
|
camera_->generateConfiguration(roles);
|
|
if (!config || config->size() != roles.size()) {
|
|
std::cerr << "Failed to get default stream configuration"
|
|
<< std::endl;
|
|
return;
|
|
}
|
|
|
|
/* Apply configuration if explicitly requested. */
|
|
if (StreamKeyValueParser::updateConfiguration(config.get(),
|
|
options_[OptStream])) {
|
|
std::cerr << "Failed to update configuration" << std::endl;
|
|
return;
|
|
}
|
|
|
|
bool strictFormats = options_.isSet(OptStrictFormats);
|
|
|
|
#ifdef HAVE_KMS
|
|
if (options_.isSet(OptDisplay)) {
|
|
if (options_.isSet(OptFile)) {
|
|
std::cerr << "--display and --file options are mutually exclusive"
|
|
<< std::endl;
|
|
return;
|
|
}
|
|
|
|
if (roles.size() != 1) {
|
|
std::cerr << "Display doesn't support multiple streams"
|
|
<< std::endl;
|
|
return;
|
|
}
|
|
|
|
if (roles[0] != StreamRole::Viewfinder) {
|
|
std::cerr << "Display requires a viewfinder stream"
|
|
<< std::endl;
|
|
return;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
switch (config->validate()) {
|
|
case CameraConfiguration::Valid:
|
|
break;
|
|
|
|
case CameraConfiguration::Adjusted:
|
|
if (strictFormats) {
|
|
std::cout << "Adjusting camera configuration disallowed by --strict-formats argument"
|
|
<< std::endl;
|
|
return;
|
|
}
|
|
std::cout << "Camera configuration adjusted" << std::endl;
|
|
break;
|
|
|
|
case CameraConfiguration::Invalid:
|
|
std::cout << "Camera configuration invalid" << std::endl;
|
|
return;
|
|
}
|
|
|
|
config_ = std::move(config);
|
|
}
|
|
|
|
CameraSession::~CameraSession()
|
|
{
|
|
if (camera_)
|
|
camera_->release();
|
|
}
|
|
|
|
void CameraSession::listControls() const
|
|
{
|
|
for (const auto &ctrl : camera_->controls()) {
|
|
const ControlId *id = ctrl.first;
|
|
const ControlInfo &info = ctrl.second;
|
|
|
|
std::cout << "Control: " << id->name() << ": "
|
|
<< info.toString() << std::endl;
|
|
}
|
|
}
|
|
|
|
void CameraSession::listProperties() const
|
|
{
|
|
for (const auto &prop : camera_->properties()) {
|
|
const ControlId *id = properties::properties.at(prop.first);
|
|
const ControlValue &value = prop.second;
|
|
|
|
std::cout << "Property: " << id->name() << " = "
|
|
<< value.toString() << std::endl;
|
|
}
|
|
}
|
|
|
|
void CameraSession::infoConfiguration() const
|
|
{
|
|
unsigned int index = 0;
|
|
for (const StreamConfiguration &cfg : *config_) {
|
|
std::cout << index << ": " << cfg.toString() << std::endl;
|
|
|
|
const StreamFormats &formats = cfg.formats();
|
|
for (PixelFormat pixelformat : formats.pixelformats()) {
|
|
std::cout << " * Pixelformat: "
|
|
<< pixelformat.toString() << " "
|
|
<< formats.range(pixelformat).toString()
|
|
<< std::endl;
|
|
|
|
for (const Size &size : formats.sizes(pixelformat))
|
|
std::cout << " - " << size.toString()
|
|
<< std::endl;
|
|
}
|
|
|
|
index++;
|
|
}
|
|
}
|
|
|
|
int CameraSession::start()
|
|
{
|
|
int ret;
|
|
|
|
queueCount_ = 0;
|
|
captureCount_ = 0;
|
|
captureLimit_ = options_[OptCapture].toInteger();
|
|
printMetadata_ = options_.isSet(OptMetadata);
|
|
|
|
ret = camera_->configure(config_.get());
|
|
if (ret < 0) {
|
|
std::cout << "Failed to configure camera" << std::endl;
|
|
return ret;
|
|
}
|
|
|
|
streamNames_.clear();
|
|
for (unsigned int index = 0; index < config_->size(); ++index) {
|
|
StreamConfiguration &cfg = config_->at(index);
|
|
streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_)
|
|
+ "-stream" + std::to_string(index);
|
|
}
|
|
|
|
camera_->requestCompleted.connect(this, &CameraSession::requestComplete);
|
|
|
|
#ifdef HAVE_KMS
|
|
if (options_.isSet(OptDisplay))
|
|
sink_ = std::make_unique<KMSSink>(options_[OptDisplay].toString());
|
|
#endif
|
|
|
|
if (options_.isSet(OptFile)) {
|
|
if (!options_[OptFile].toString().empty())
|
|
sink_ = std::make_unique<FileSink>(streamNames_,
|
|
options_[OptFile]);
|
|
else
|
|
sink_ = std::make_unique<FileSink>(streamNames_);
|
|
}
|
|
|
|
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_);
|
|
|
|
return startCapture();
|
|
}
|
|
|
|
void CameraSession::stop()
|
|
{
|
|
int ret = camera_->stop();
|
|
if (ret)
|
|
std::cout << "Failed to stop capture" << std::endl;
|
|
|
|
if (sink_) {
|
|
ret = sink_->stop();
|
|
if (ret)
|
|
std::cout << "Failed to stop frame sink" << std::endl;
|
|
}
|
|
|
|
sink_.reset();
|
|
|
|
requests_.clear();
|
|
|
|
allocator_.reset();
|
|
}
|
|
|
|
int CameraSession::startCapture()
|
|
{
|
|
int ret;
|
|
|
|
/* Identify the stream with the least number of buffers. */
|
|
unsigned int nbuffers = UINT_MAX;
|
|
for (StreamConfiguration &cfg : *config_) {
|
|
ret = allocator_->allocate(cfg.stream());
|
|
if (ret < 0) {
|
|
std::cerr << "Can't allocate buffers" << std::endl;
|
|
return -ENOMEM;
|
|
}
|
|
|
|
unsigned int allocated = allocator_->buffers(cfg.stream()).size();
|
|
nbuffers = std::min(nbuffers, allocated);
|
|
}
|
|
|
|
/*
|
|
* TODO: make cam tool smarter to support still capture by for
|
|
* example pushing a button. For now run all streams all the time.
|
|
*/
|
|
|
|
for (unsigned int i = 0; i < nbuffers; i++) {
|
|
std::unique_ptr<Request> request = camera_->createRequest();
|
|
if (!request) {
|
|
std::cerr << "Can't create request" << std::endl;
|
|
return -ENOMEM;
|
|
}
|
|
|
|
for (StreamConfiguration &cfg : *config_) {
|
|
Stream *stream = cfg.stream();
|
|
const std::vector<std::unique_ptr<FrameBuffer>> &buffers =
|
|
allocator_->buffers(stream);
|
|
const std::unique_ptr<FrameBuffer> &buffer = buffers[i];
|
|
|
|
ret = request->addBuffer(stream, buffer.get());
|
|
if (ret < 0) {
|
|
std::cerr << "Can't set buffer for request"
|
|
<< std::endl;
|
|
return ret;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
for (std::unique_ptr<Request> &request : requests_) {
|
|
ret = queueRequest(request.get());
|
|
if (ret < 0) {
|
|
std::cerr << "Can't queue request" << std::endl;
|
|
camera_->stop();
|
|
if (sink_)
|
|
sink_->stop();
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
if (captureLimit_)
|
|
std::cout << "cam" << cameraIndex_
|
|
<< ": Capture " << captureLimit_ << " frames"
|
|
<< std::endl;
|
|
else
|
|
std::cout << "cam" << cameraIndex_
|
|
<< ": Capture until user interrupts by SIGINT"
|
|
<< std::endl;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int CameraSession::queueRequest(Request *request)
|
|
{
|
|
if (captureLimit_ && queueCount_ >= captureLimit_)
|
|
return 0;
|
|
|
|
queueCount_++;
|
|
|
|
return camera_->queueRequest(request);
|
|
}
|
|
|
|
void CameraSession::requestComplete(Request *request)
|
|
{
|
|
if (request->status() == Request::RequestCancelled)
|
|
return;
|
|
|
|
/*
|
|
* Defer processing of the completed request to the event loop, to avoid
|
|
* blocking the camera manager thread.
|
|
*/
|
|
EventLoop::instance()->callLater([=]() { processRequest(request); });
|
|
}
|
|
|
|
void CameraSession::processRequest(Request *request)
|
|
{
|
|
/*
|
|
* If we've reached the capture limit, we're done. This doesn't
|
|
* duplicate the check below that emits the captureDone signal, as this
|
|
* function will be called for each request still in flight after the
|
|
* capture limit is reached and we don't want to emit the signal every
|
|
* single time.
|
|
*/
|
|
if (captureLimit_ && captureCount_ >= captureLimit_)
|
|
return;
|
|
|
|
const Request::BufferMap &buffers = request->buffers();
|
|
|
|
/*
|
|
* Compute the frame rate. The timestamp is arbitrarily retrieved from
|
|
* the first buffer, as all buffers should have matching timestamps.
|
|
*/
|
|
uint64_t ts = buffers.begin()->second->metadata().timestamp;
|
|
double fps = ts - last_;
|
|
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
|
|
<< " (" << std::fixed << std::setprecision(2) << fps << " fps)";
|
|
|
|
for (auto it = buffers.begin(); it != buffers.end(); ++it) {
|
|
const Stream *stream = it->first;
|
|
FrameBuffer *buffer = it->second;
|
|
|
|
const FrameMetadata &metadata = buffer->metadata();
|
|
|
|
info << " " << streamNames_[stream]
|
|
<< " seq: " << std::setw(6) << std::setfill('0') << metadata.sequence
|
|
<< " bytesused: ";
|
|
|
|
unsigned int nplane = 0;
|
|
for (const FrameMetadata::Plane &plane : metadata.planes()) {
|
|
info << plane.bytesused;
|
|
if (++nplane < metadata.planes().size())
|
|
info << "/";
|
|
}
|
|
}
|
|
|
|
if (sink_) {
|
|
if (!sink_->processRequest(request))
|
|
requeue = false;
|
|
}
|
|
|
|
std::cout << info.str() << std::endl;
|
|
|
|
if (printMetadata_) {
|
|
const ControlList &requestMetadata = request->metadata();
|
|
for (const auto &ctrl : requestMetadata) {
|
|
const ControlId *id = controls::controls.at(ctrl.first);
|
|
std::cout << "\t" << id->name() << " = "
|
|
<< ctrl.second.toString() << std::endl;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Notify the user that capture is complete if the limit has just been
|
|
* reached.
|
|
*/
|
|
captureCount_++;
|
|
if (captureLimit_ && captureCount_ >= captureLimit_) {
|
|
captureDone.emit();
|
|
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);
|
|
}
|