NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: pipeline_handler: Mark controls() and properties() as const operations

Browse source 
Reading the controls and properties does not modify the pipeline's state
and can be marked as const operations.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2020-08-06 14:36:23 +02:00
parent ef5f5c4db0
commit 0b9d8eb265
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,8 +68,8 @@ public:
bool lock();
void unlock();
const ControlInfoMap &controls(Camera *camera);
const ControlList &properties(Camera *camera);
const ControlInfoMap &controls(const Camera *camera) const;
const ControlList &properties(const Camera *camera) const;
virtual CameraConfiguration *generateConfiguration(Camera *camera,
const StreamRoles &roles) = 0;

8
src/libcamera/pipeline_handler.cpp
View file

@ -257,9 +257,9 @@ void PipelineHandler::unlock()
* \context This function is \threadsafe.
* \return A ControlInfoMap listing the controls support by \a camera
*/
const ControlInfoMap &PipelineHandler::controls(Camera *camera)
const ControlInfoMap &PipelineHandler::controls(const Camera *camera) const
{
CameraData *data = cameraData(camera);
const CameraData *data = cameraData(camera);
return data->controlInfo_;
}
@ -268,9 +268,9 @@ const ControlInfoMap &PipelineHandler::controls(Camera *camera)
* \param[in] camera The camera
* \return A ControlList of properties supported by \a camera
*/
const ControlList &PipelineHandler::properties(Camera *camera)
const ControlList &PipelineHandler::properties(const Camera *camera) const
{
CameraData *data = cameraData(camera);
const CameraData *data = cameraData(camera);
return data->properties_;
}