From b0c730e330281f38ac51cb64d9581ed278759048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Fri, 5 Apr 2019 02:52:59 +0200 Subject: libcamera: Switch to CameraConfiguration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implement the camera configuration thru out the library, tests, cam and qcam tools. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/cam/main.cpp | 8 ++++---- src/libcamera/camera.cpp | 25 ++++++++++++------------- src/libcamera/include/pipeline_handler.h | 6 +++--- src/libcamera/pipeline/ipu3/ipu3.cpp | 10 +++++----- src/libcamera/pipeline/uvcvideo.cpp | 12 ++++++------ src/libcamera/pipeline/vimc.cpp | 12 ++++++------ src/libcamera/pipeline_handler.cpp | 6 +++--- src/qcam/main_window.cpp | 2 +- src/qcam/main_window.h | 2 +- 9 files changed, 41 insertions(+), 42 deletions(-) (limited to 'src') diff --git a/src/cam/main.cpp b/src/cam/main.cpp index d45ffd37..99ce564a 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -78,10 +78,10 @@ static int parseOptions(int argc, char *argv[]) return 0; } -static int prepareCameraConfig(std::map *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 static int capture() { - std::map config; + CameraConfiguration config; std::vector 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) { diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index ddf5c268..bdf14b31 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -543,21 +543,21 @@ const std::set &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 +CameraConfiguration Camera::streamConfiguration(const std::vector &usages) { if (disconnected_ || !usages.size() || usages.size() > streams_.size()) - return std::map{}; + 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 &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 &config) +int Camera::configureStreams(const CameraConfiguration &config) { int ret; @@ -589,14 +589,14 @@ int Camera::configureStreams(std::map &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 &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); diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h index 8a1706fa..b6cbd3ba 100644 --- a/src/libcamera/include/pipeline_handler.h +++ b/src/libcamera/include/pipeline_handler.h @@ -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 + virtual CameraConfiguration streamConfiguration(Camera *camera, const std::vector &usages) = 0; - virtual int configureStreams(Camera *camera, - std::map &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; diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 5d01504e..ca09da75 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -139,11 +139,11 @@ public: PipelineHandlerIPU3(CameraManager *manager); ~PipelineHandlerIPU3(); - std::map + CameraConfiguration streamConfiguration(Camera *camera, const std::vector &usages) override; int configureStreams(Camera *camera, - std::map &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 +CameraConfiguration PipelineHandlerIPU3::streamConfiguration(Camera *camera, const std::vector &usages) { - std::map 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 &config) + const CameraConfiguration &config) { IPU3CameraData *data = cameraData(camera); const StreamConfiguration &cfg = config[&data->stream_]; diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index dfff7116..cd472cfa 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -26,11 +26,11 @@ public: PipelineHandlerUVC(CameraManager *manager); ~PipelineHandlerUVC(); - std::map + CameraConfiguration streamConfiguration(Camera *camera, const std::vector &usages) override; int configureStreams(Camera *camera, - std::map &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 +CameraConfiguration PipelineHandlerUVC::streamConfiguration(Camera *camera, const std::vector &usages) { UVCCameraData *data = cameraData(camera); - std::map configs; + CameraConfiguration configs; StreamConfiguration config{}; config.width = 640; @@ -101,10 +101,10 @@ PipelineHandlerUVC::streamConfiguration(Camera *camera, } int PipelineHandlerUVC::configureStreams(Camera *camera, - std::map &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 " diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 4da4ca01..c8bbe2a1 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -26,11 +26,11 @@ public: PipelineHandlerVimc(CameraManager *manager); ~PipelineHandlerVimc(); - std::map + CameraConfiguration streamConfiguration(Camera *camera, const std::vector &usages) override; int configureStreams(Camera *camera, - std::map &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 +CameraConfiguration PipelineHandlerVimc::streamConfiguration(Camera *camera, const std::vector &usages) { VimcCameraData *data = cameraData(camera); - std::map configs; + CameraConfiguration configs; StreamConfiguration config{}; config.width = 640; @@ -101,10 +101,10 @@ PipelineHandlerVimc::streamConfiguration(Camera *camera, } int PipelineHandlerVimc::configureStreams(Camera *camera, - std::map &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 " diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 0574f990..43550c0e 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -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 diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index faa3bc57..4bc04403 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -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; diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 5e27a8fd..9b31da2b 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -46,7 +46,7 @@ private: std::shared_ptr camera_; bool isCapturing_; - std::map config_; + CameraConfiguration config_; ViewFinder *viewfinder_; }; -- cgit v1.2.1