Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-17 01:15:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: pipeline_handler: Drop controls() and properties() functions

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2021-07-30 06:05:45 +03:00
parent 1815a0290f
commit 034b5d3699
3 changed files with 2 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/libcamera/internal/pipeline_handler.h
View file

@ -46,9 +46,6 @@ public:
bool lock(); bool lock();
void unlock(); void unlock();
const ControlInfoMap &controls(const Camera *camera) const;
const ControlList &properties(const Camera *camera) const;
virtual CameraConfiguration *generateConfiguration(Camera *camera, virtual CameraConfiguration *generateConfiguration(Camera *camera,
const StreamRoles &roles) = 0; const StreamRoles &roles) = 0;
virtual int configure(Camera *camera, CameraConfiguration *config) = 0; virtual int configure(Camera *camera, CameraConfiguration *config) = 0;

4
src/libcamera/camera.cpp
View file

@ -800,7 +800,7 @@ int Camera::release()
*/ */
const ControlInfoMap &Camera::controls() const 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 const ControlList &Camera::properties() const
{ {
return _d()->pipe_->properties(this); return _d()->properties_;
} }
/** /**

21
src/libcamera/pipeline_handler.cpp
View file

@ -176,27 +176,6 @@ void PipelineHandler::unlock()
media->unlock(); media->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() * \fn PipelineHandler::generateConfiguration()
* \brief Generate a camera configuration for a specified camera * \brief Generate a camera configuration for a specified camera