libcamera/jmondi/libcamera.git - Jacopo Mondi's clone of libcamera

diff options

author	Jacopo Mondi <jacopo@jmondi.org>	2020-09-09 14:56:35 +0200
committer	Jacopo Mondi <jacopo@jmondi.org>	2020-09-18 14:59:58 +0200
commit	7208e70211a6ea35b9d889aedf942e607d20d66a (patch)
tree	6907a06bb8a63f31e154544b29279dcce90c8969 /utils/raspberrypi
parent	45fe8e99c83889816df320c6d27f7a2019744693 (diff)

libcamera: ipu3: Always use sensor full frame size

When calculating the pipeline configuration for the IPU3 platform, libcamera tries to be smart and select the smallest sensor frame resolution large enough to accommodate the stream sizes requested by the application. While this makes a lot of sense, in practice optimizing the selected sensor resolution makes the pipeline configuration calculation process fail in multiple occasions, or results in stalls during capture. As a trivial example, capturing with cam with the following command line results in a stall: $ cam -swidth=1280,height=720 -swidth=640,height=480 -c1 -C Likewise, the Android HAL supported format enumeration fails in reporting smaller resolutions as supported when used with the OV5670 sensor. 320x240: DEBUG IPU3 ipu3.cpp:192 CIO2 configuration: 648x486-SGRBG10_IPU3 ERROR IPU3 imgu.cpp:408 Failed to calculate pipe configuration ERROR IPU3 ipu3.cpp:299 Failed to calculate pipe configuration: unsupported resolutions. 640x480: DEBUG IPU3 ipu3.cpp:192 CIO2 configuration: 320x240-SGRBG10_IPU3 ERROR IPU3 imgu.cpp:408 Failed to calculate pipe configuration ERROR IPU3 ipu3.cpp:299 Failed to calculate pipe configuration: unsupported resolutions. Furthermore the reference xml files used for the IPU3 camera configuration on the ChromeOS platform restricts the number of sensor resolution to be used for the OV5670 sensor to 2 from the 6 supported by the driver [1]. The selection criteria of the correct CIO2 mode are not specified, and for the time being, as a workaround, always use the sensor maximum resolution at the expense of frame rate and bus bandwidth to allow the pipeline to successfully support smaller modes for the OV5670 sensor and solve pipeline stalls when capturing with both sensors. [1] See the <sensor_modes> enumeration in: https://chromium.googlesource.com/chromiumos/overlays/board-overlays/+/master/baseboard-poppy/media-libs/cros-camera-hal-configs-poppy/files/gcss/graph_settings_ov5670.xml Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Diffstat (limited to 'utils/raspberrypi')

0 files changed, 0 insertions, 0 deletions

/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019, Google Inc. * * main.cpp - cam - The libcamera swiss army knife */ #include <iomanip> #include <iostream> #include <signal.h> #include <string.h> #include <libcamera/libcamera.h> #include <libcamera/property_ids.h> #include "capture.h" #include "event_loop.h" #include "main.h" #include "options.h" #include "stream_options.h" using namespace libcamera; class CamApp { public: CamApp(); ~CamApp(); static CamApp *instance(); int init(int argc, char **argv); void cleanup(); int exec(); void quit(); private: void cameraAdded(std::shared_ptr<Camera> cam); void cameraRemoved(std::shared_ptr<Camera> cam); int parseOptions(int argc, char *argv[]); int prepareConfig(); int listControls(); int listProperties(); int infoConfiguration(); int run(); std::string const cameraName(const Camera *camera); static CamApp *app_; OptionsParser::Options options_; CameraManager *cm_; std::shared_ptr<Camera> camera_; std::unique_ptr<libcamera::CameraConfiguration> config_; EventLoop loop_; bool strictFormats_; }; CamApp *CamApp::app_ = nullptr; CamApp::CamApp() : cm_(nullptr), camera_(nullptr), config_(nullptr), strictFormats_(false) { CamApp::app_ = this; } CamApp::~CamApp() { delete cm_; } CamApp *CamApp::instance() { return CamApp::app_; } int CamApp::init(int argc, char **argv) { int ret; ret = parseOptions(argc, argv); if (ret < 0) return ret; if (options_.isSet(OptStrictFormats)) strictFormats_ = true; cm_ = new CameraManager(); ret = cm_->start(); if (ret) { std::cout << "Failed to start camera manager: " << strerror(-ret) << std::endl; return ret; } if (options_.isSet(OptCamera)) { const std::string &cameraId = options_[OptCamera]; 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::cout << "Camera " << std::string(options_[OptCamera]) << " not found" << std::endl; cleanup(); return -ENODEV; } if (camera_->acquire()) { std::cout << "Failed to acquire camera" << std::endl; cleanup(); return -EINVAL; } std::cout << "Using camera " << camera_->id() << std::endl; ret = prepareConfig(); if (ret) { cleanup(); return ret; } } if (options_.isSet(OptMonitor)) { cm_->cameraAdded.connect(this, &CamApp::cameraAdded); cm_->cameraRemoved.connect(this, &CamApp::cameraRemoved); std::cout << "Monitoring new hotplug and unplug events" << std::endl; } return 0; } void CamApp::cleanup() { if (camera_) { camera_->release(); camera_.reset(); } config_.reset(); cm_->stop(); } int CamApp::exec() { int ret; ret = run(); cleanup(); return ret; } void CamApp::quit() { loop_.exit(); } int CamApp::parseOptions(int argc, char *argv[]) { StreamKeyValueParser streamKeyValue; OptionsParser parser; parser.addOption(OptCamera, OptionString, "Specify which camera to operate on, by id or by index", "camera", ArgumentRequired, "camera"); parser.addOption(OptCapture, OptionInteger, "Capture until interrupted by user or until <count> frames captured", "capture", ArgumentOptional, "count"); parser.addOption(OptFile, OptionString, "Write captured frames to disk\n" "The first '#' character in the file name is expanded to the stream name and frame sequence number.\n" "The default file name is 'frame-#.bin'.", "file", ArgumentOptional, "filename"); parser.addOption(OptStream, &streamKeyValue, "Set configuration of a camera stream", "stream", true); parser.addOption(OptHelp, OptionNone, "Display this help message", "help"); parser.addOption(OptInfo, OptionNone, "Display information about stream(s)", "info"); parser.addOption(OptList, OptionNone, "List all cameras", "list"); parser.addOption(OptListControls, OptionNone, "List cameras controls", "list-controls"); parser.addOption(OptListProperties, OptionNone, "List cameras properties", "list-properties"); parser.addOption(OptMonitor, OptionNone, "Monitor for hotplug and unplug camera events", "monitor"); parser.addOption(OptStrictFormats, OptionNone, "Do not allow requested stream format(s) to be adjusted", "strict-formats"); options_ = parser.parse(argc, argv); if (!options_.valid()) return -EINVAL; if (options_.empty() || options_.isSet(OptHelp)) { parser.usage(); return options_.empty() ? -EINVAL : -EINTR; } return 0; } int CamApp::prepareConfig() { StreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]); config_ = camera_->generateConfiguration(roles); if (!config_ || config_->size() != roles.size()) { std::cerr << "Failed to get default stream configuration" << std::endl; return -EINVAL; } /* Apply configuration if explicitly requested. */ if (StreamKeyValueParser::updateConfiguration(config_.get(), options_[OptStream])) { std::cerr << "Failed to update configuration" << std::endl; return -EINVAL; } switch (config_->validate()) { case CameraConfiguration::Valid: break; case CameraConfiguration::Adjusted: if (strictFormats_) { std::cout << "Adjusting camera configuration disallowed by --strict-formats argument" << std::endl; config_.reset(); return -EINVAL; } std::cout << "Camera configuration adjusted" << std::endl; break; case CameraConfiguration::Invalid: std::cout << "Camera configuration invalid" << std::endl; config_.reset(); return -EINVAL; } return 0; } int CamApp::listControls() { if (!camera_) { std::cout << "Cannot list controls without a camera" << std::endl; return -EINVAL; } 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; } return 0; } int CamApp::listProperties() { if (!camera_) { std::cout << "Cannot list properties without a camera" << std::endl; return -EINVAL; } 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; } return 0; } int CamApp::infoConfiguration() { if (!config_) { std::cout << "Cannot print stream information without a camera" << std::endl; return -EINVAL; } 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++; } return 0; } void CamApp::cameraAdded(std::shared_ptr<Camera> cam) { std::cout << "Camera Added: " << cam->id() << std::endl; } void CamApp::cameraRemoved(std::shared_ptr<Camera> cam) { std::cout << "Camera Removed: " << cam->id() << std::endl; } int CamApp::run() { int ret; if (options_.isSet(OptList)) { std::cout << "Available cameras:" << std::endl; unsigned int index = 1; for (const std::shared_ptr<Camera> &cam : cm_->cameras()) { std::cout << index << ": " << cameraName(cam.get()) << std::endl; index++; } } if (options_.isSet(OptListControls)) { ret = listControls(); if (ret) return ret; } if (options_.isSet(OptListProperties)) { ret = listProperties();


context:
space:
mode: