From 23c60fcdff048863b372d9974bac85c3b73b8c71 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 24 Dec 2020 17:54:07 +0200 Subject: libcamera: pipeline: simple: Cache pipeline config in SimpleCameraConfiguration As the pipeline configuration is selected in SimpleCameraConfiguration::validate() already, cache it in the SimpleCameraConfiguration instead of looking it up in SimplePipelineHandler::configure(). This makes little difference at the moment, but will save duplication of more complex logic between validate() and configure() when adding support for multiple streams. Signed-off-by: Laurent Pinchart Tested-by: Phi-Bang Nguyen Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/simple/simple.cpp | 38 ++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'src/libcamera/pipeline') diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index bce19009..9c32ad02 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -177,6 +177,11 @@ public: Status validate() override; + const SimpleCameraData::Configuration *pipeConfig() const + { + return pipeConfig_; + } + bool needConversion() const { return needConversion_; } private: @@ -188,6 +193,7 @@ private: std::shared_ptr camera_; const SimpleCameraData *data_; + const SimpleCameraData::Configuration *pipeConfig_; bool needConversion_; }; @@ -506,7 +512,7 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format, SimpleCameraConfiguration::SimpleCameraConfiguration(Camera *camera, SimpleCameraData *data) : CameraConfiguration(), camera_(camera->shared_from_this()), - data_(data) + data_(data), pipeConfig_(nullptr) { } @@ -542,18 +548,18 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() status = Adjusted; } - const SimpleCameraData::Configuration &pipeConfig = it->second; - if (!pipeConfig.outputSizes.contains(cfg.size)) { + pipeConfig_ = &it->second; + if (!pipeConfig_->outputSizes.contains(cfg.size)) { LOG(SimplePipeline, Debug) << "Adjusting size from " << cfg.size.toString() - << " to " << pipeConfig.captureSize.toString(); - cfg.size = pipeConfig.captureSize; + << " to " << pipeConfig_->captureSize.toString(); + cfg.size = pipeConfig_->captureSize; status = Adjusted; } /* \todo Create a libcamera core class to group format and size */ - needConversion_ = cfg.pixelFormat != pipeConfig.captureFormat - || cfg.size != pipeConfig.captureSize; + needConversion_ = cfg.pixelFormat != pipeConfig_->captureFormat + || cfg.size != pipeConfig_->captureSize; cfg.bufferCount = 3; @@ -647,21 +653,19 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) if (ret < 0) return ret; - const SimpleCameraData::Configuration &pipeConfig = - data->formats_[cfg.pixelFormat]; - - V4L2SubdeviceFormat format{ pipeConfig.code, data->sensor_->resolution() }; + const SimpleCameraData::Configuration *pipeConfig = config->pipeConfig(); + V4L2SubdeviceFormat format{ pipeConfig->code, data->sensor_->resolution() }; ret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat); if (ret < 0) return ret; /* Configure the video node. */ - V4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig.captureFormat); + V4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig->captureFormat); V4L2DeviceFormat captureFormat; captureFormat.fourcc = videoFormat; - captureFormat.size = pipeConfig.captureSize; + captureFormat.size = pipeConfig->captureSize; ret = video->setFormat(&captureFormat); if (ret) @@ -674,10 +678,10 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) } if (captureFormat.fourcc != videoFormat || - captureFormat.size != pipeConfig.captureSize) { + captureFormat.size != pipeConfig->captureSize) { LOG(SimplePipeline, Error) << "Unable to configure capture in " - << pipeConfig.captureSize.toString() << "-" + << pipeConfig->captureSize.toString() << "-" << videoFormat.toString(); return -EINVAL; } @@ -687,8 +691,8 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) if (useConverter_) { StreamConfiguration inputCfg; - inputCfg.pixelFormat = pipeConfig.captureFormat; - inputCfg.size = pipeConfig.captureSize; + inputCfg.pixelFormat = pipeConfig->captureFormat; + inputCfg.size = pipeConfig->captureSize; inputCfg.stride = captureFormat.planes[0].bpl; inputCfg.bufferCount = cfg.bufferCount; -- cgit v1.2.1