PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Switch to CameraConfiguration

Browse Source 
Implement the camera configuration thru out the library, tests, cam and
qcam tools.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2019-04-05 02:52:59 +02:00
parent 9a7dc3ce7f
commit b0c730e330
16 changed files with 54 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cam/main.cpp
+4 -4
View File
@@ -78,10 +78,10 @@ static int parseOptions(int argc, char *argv[])
return 0;
}
static int prepareCameraConfig(std::map<Stream *, StreamConfiguration> *config)
static int prepareCameraConfig(CameraConfiguration *config)
{
*config = camera->streamConfiguration({ Stream::VideoRecording() });
Stream *stream = config->begin()->first;
Stream *stream = config->front();
if (options.isSet(OptFormat)) {
KeyValueParser::Options format = options[OptFormat];
@@ -135,7 +135,7 @@ static void requestComplete(Request *request, const std::map<Stream *, Buffer *>
static int capture()
{
std::map<Stream *, StreamConfiguration> config;
CameraConfiguration config;
std::vector<Request *> requests;
int ret;
@@ -151,7 +151,7 @@ static int capture()
return ret;
}
Stream *stream = config.begin()->first;
Stream *stream = config.front();
ret = camera->allocateBuffers();
if (ret) {
src/libcamera/camera.cpp
+12 -13
View File
@@ -543,21 +543,21 @@ const std::set<Stream *> &Camera::streams() const
* list of stream usages and the camera returns a map of suitable streams and
* their suggested default configurations.
*
* \return A map of streams to configurations if the requested usages can be
* satisfied, or an empty map otherwise
* \return A valid CameraConfiguration if the requested usages can be satisfied,
* or a invalid one otherwise
*/
std::map<Stream *, StreamConfiguration>
CameraConfiguration
Camera::streamConfiguration(const std::vector<StreamUsage> &usages)
{
if (disconnected_ || !usages.size() || usages.size() > streams_.size())
return std::map<Stream *, StreamConfiguration>{};
return CameraConfiguration();
return pipe_->streamConfiguration(this, usages);
}
/**
* \brief Configure the camera's streams prior to capture
* \param[in] config A map of stream IDs and configurations to setup
* \param[in] config The camera configurations to setup
*
* Prior to starting capture, the camera must be configured to select a
* group of streams to be involved in the capture and their configuration.
@@ -579,7 +579,7 @@ Camera::streamConfiguration(const std::vector<StreamUsage> &usages)
* \retval -EACCES The camera is not in a state where it can be configured
* \retval -EINVAL The configuration is not valid
*/
int Camera::configureStreams(std::map<Stream *, StreamConfiguration> &config)
int Camera::configureStreams(const CameraConfiguration &config)
{
int ret;
@@ -589,14 +589,14 @@ int Camera::configureStreams(std::map<Stream *, StreamConfiguration> &config)
if (!stateBetween(CameraAcquired, CameraConfigured))
return -EACCES;
if (!config.size()) {
if (!config.isValid()) {
LOG(Camera, Error)
<< "Can't configure streams without a configuration";
<< "Can't configure camera with invalid configuration";
return -EINVAL;
}
for (auto const &iter : config) {
if (streams_.find(iter.first) == streams_.end())
for (Stream *stream : config) {
if (streams_.find(stream) == streams_.end())
return -EINVAL;
}
@@ -605,9 +605,8 @@ int Camera::configureStreams(std::map<Stream *, StreamConfiguration> &config)
return ret;
activeStreams_.clear();
for (auto const &iter : config) {
Stream *stream = iter.first;
const StreamConfiguration &cfg = iter.second;
for (Stream *stream : config) {
const StreamConfiguration &cfg = config[stream];
stream->configuration_ = cfg;
activeStreams_.insert(stream);
src/libcamera/include/pipeline_handler.h
+3 -3
View File
@@ -18,6 +18,7 @@ namespace libcamera {
class Buffer;
class BufferPool;
class Camera;
class CameraConfiguration;
class CameraManager;
class DeviceEnumerator;
class MediaDevice;
@@ -52,10 +53,9 @@ public:
virtual bool match(DeviceEnumerator *enumerator) = 0;
virtual std::map<Stream *, StreamConfiguration>
virtual CameraConfiguration
streamConfiguration(Camera *camera, const std::vector<StreamUsage> &usages) = 0;
virtual int configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config) = 0;
virtual int configureStreams(Camera *camera, const CameraConfiguration &config) = 0;
virtual int allocateBuffers(Camera *camera, Stream *stream) = 0;
virtual int freeBuffers(Camera *camera, Stream *stream) = 0;
src/libcamera/pipeline/ipu3/ipu3.cpp
+5 -5
View File
@@ -139,11 +139,11 @@ public:
PipelineHandlerIPU3(CameraManager *manager);
~PipelineHandlerIPU3();
std::map<Stream *, StreamConfiguration>
CameraConfiguration
streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages) override;
int configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config) override;
const CameraConfiguration &config) override;
int allocateBuffers(Camera *camera, Stream *stream) override;
int freeBuffers(Camera *camera, Stream *stream) override;
@@ -204,11 +204,11 @@ PipelineHandlerIPU3::~PipelineHandlerIPU3()
imguMediaDev_->release();
}
std::map<Stream *, StreamConfiguration>
CameraConfiguration
PipelineHandlerIPU3::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
std::map<Stream *, StreamConfiguration> configs;
CameraConfiguration configs;
IPU3CameraData *data = cameraData(camera);
StreamConfiguration *config = &configs[&data->stream_];
@@ -234,7 +234,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,
}
int PipelineHandlerIPU3::configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config)
const CameraConfiguration &config)
{
IPU3CameraData *data = cameraData(camera);
const StreamConfiguration &cfg = config[&data->stream_];
src/libcamera/pipeline/uvcvideo.cpp
+6 -6
View File
@@ -26,11 +26,11 @@ public:
PipelineHandlerUVC(CameraManager *manager);
~PipelineHandlerUVC();
std::map<Stream *, StreamConfiguration>
CameraConfiguration
streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages) override;
int configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config) override;
const CameraConfiguration &config) override;
int allocateBuffers(Camera *camera, Stream *stream) override;
int freeBuffers(Camera *camera, Stream *stream) override;
@@ -82,12 +82,12 @@ PipelineHandlerUVC::~PipelineHandlerUVC()
media_->release();
}
std::map<Stream *, StreamConfiguration>
CameraConfiguration
PipelineHandlerUVC::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
UVCCameraData *data = cameraData(camera);
std::map<Stream *, StreamConfiguration> configs;
CameraConfiguration configs;
StreamConfiguration config{};
config.width = 640;
@@ -101,10 +101,10 @@ PipelineHandlerUVC::streamConfiguration(Camera *camera,
}
int PipelineHandlerUVC::configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config)
const CameraConfiguration &config)
{
UVCCameraData *data = cameraData(camera);
StreamConfiguration *cfg = &config[&data->stream_];
const StreamConfiguration *cfg = &config[&data->stream_];
int ret;
LOG(UVC, Debug) << "Configure the camera for resolution "
src/libcamera/pipeline/vimc.cpp
+6 -6
View File
@@ -26,11 +26,11 @@ public:
PipelineHandlerVimc(CameraManager *manager);
~PipelineHandlerVimc();
std::map<Stream *, StreamConfiguration>
CameraConfiguration
streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages) override;
int configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config) override;
const CameraConfiguration &config) override;
int allocateBuffers(Camera *camera, Stream *stream) override;
int freeBuffers(Camera *camera, Stream *stream) override;
@@ -82,12 +82,12 @@ PipelineHandlerVimc::~PipelineHandlerVimc()
media_->release();
}
std::map<Stream *, StreamConfiguration>
CameraConfiguration
PipelineHandlerVimc::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
VimcCameraData *data = cameraData(camera);
std::map<Stream *, StreamConfiguration> configs;
CameraConfiguration configs;
StreamConfiguration config{};
config.width = 640;
@@ -101,10 +101,10 @@ PipelineHandlerVimc::streamConfiguration(Camera *camera,
}
int PipelineHandlerVimc::configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config)
const CameraConfiguration &config)
{
VimcCameraData *data = cameraData(camera);
StreamConfiguration *cfg = &config[&data->stream_];
const StreamConfiguration *cfg = &config[&data->stream_];
int ret;
LOG(VIMC, Debug) << "Configure the camera for resolution "
src/libcamera/pipeline_handler.cpp
+3 -3
View File
@@ -163,15 +163,15 @@ PipelineHandler::~PipelineHandler()
* The intended companion to this is \a configureStreams() which can be used to
* change the group of streams parameters.
*
* \return A map of successfully retrieved streams and configurations or an
* empty map on error.
* \return A valid CameraConfiguration if the requested usages can be satisfied,
* or a invalid configuration otherwise
*/
/**
* \fn PipelineHandler::configureStreams()
* \brief Configure a group of streams for capture
* \param[in] camera The camera to configure
* \param[in] config A map of stream configurations to apply
* \param[in] config The camera configurations to setup
*
* Configure the specified group of streams for \a camera according to the
* configuration specified in \a configs. The intended caller of this interface
src/qcam/main_window.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ int MainWindow::startCapture()
int ret;
config_ = camera_->streamConfiguration({ Stream::VideoRecording() });
Stream *stream = config_.begin()->first;
Stream *stream = config_.front();
ret = camera_->configureStreams(config_);
if (ret < 0) {
std::cout << "Failed to configure camera" << std::endl;
src/qcam/main_window.h
+1 -1
View File
@@ -46,7 +46,7 @@ private:
std::shared_ptr<Camera> camera_;
bool isCapturing_;
std::map<Stream *, StreamConfiguration> config_;
CameraConfiguration config_;
ViewFinder *viewfinder_;
};