summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-07-30 06:05:45 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-08-17 00:24:16 +0300
commit034b5d36992cbb345edbc7e9f7219d1093cbcf00 (patch)
tree81eda8bae97eb08ecc0d9fed483dd8a4dc42d5c5
parent1815a0290f5136efe7b0b43222c506774e7a8e1a (diff)
libcamera: pipeline_handler: Drop controls() and properties() functions
The PipelineHandler controls() and properties() functions are only used by the Camera class. Now that the controls and properties are stored in the Camera::Private class, we can drop those functions and access the private data directly in Camera::controls() and Camera::properties(). Suggested-by: Jacopo Mondi <jacopo@jmondi.org> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--include/libcamera/internal/pipeline_handler.h3
-rw-r--r--src/libcamera/camera.cpp4
-rw-r--r--src/libcamera/pipeline_handler.cpp21
3 files changed, 2 insertions, 26 deletions
diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
index 1e48f707..41cba44d 100644
--- a/include/libcamera/internal/pipeline_handler.h
+++ b/include/libcamera/internal/pipeline_handler.h
@@ -46,9 +46,6 @@ public:
bool lock();
void unlock();
- const ControlInfoMap &controls(const Camera *camera) const;
- const ControlList &properties(const Camera *camera) const;
-
virtual CameraConfiguration *generateConfiguration(Camera *camera,
const StreamRoles &roles) = 0;
virtual int configure(Camera *camera, CameraConfiguration *config) = 0;
diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index a22cc7b8..c20e0501 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -800,7 +800,7 @@ int Camera::release()
*/
const ControlInfoMap &Camera::controls() const
{
- return _d()->pipe_->controls(this);
+ return _d()->controlInfo_;
}
/**
@@ -813,7 +813,7 @@ const ControlInfoMap &Camera::controls() const
*/
const ControlList &Camera::properties() const
{
- return _d()->pipe_->properties(this);
+ return _d()->properties_;
}
/**
diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
index 62d29cbe..597d4c6a 100644
--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
@@ -177,27 +177,6 @@ void PipelineHandler::unlock()
}
/**
- * \brief Retrieve the list of controls for a camera
- * \param[in] camera The camera
- * \context This function is \threadsafe.
- * \return A ControlInfoMap listing the controls support by \a camera
- */
-const ControlInfoMap &PipelineHandler::controls(const Camera *camera) const
-{
- return camera->_d()->controlInfo_;
-}
-
-/**
- * \brief Retrieve the list of properties for a camera
- * \param[in] camera The camera
- * \return A ControlList of properties supported by \a camera
- */
-const ControlList &PipelineHandler::properties(const Camera *camera) const
-{
- return camera->_d()->properties_;
-}
-
-/**
* \fn PipelineHandler::generateConfiguration()
* \brief Generate a camera configuration for a specified camera
* \param[in] camera The camera to generate a default configuration for