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

libcamera: camera: Constify controls argument to start()

Browse source 
The ControlList passed to the Camera::start() function isn't modified.
Make it const.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2021-02-12 04:37:16 +02:00
parent f73c505f71
commit 79991a9903
9 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/camera.h
View file

@ -100,7 +100,7 @@ public:
std::unique_ptr<Request> createRequest(uint64_t cookie = 0); std::unique_ptr<Request> createRequest(uint64_t cookie = 0);
int queueRequest(Request *request); int queueRequest(Request *request);
int start(ControlList *controls = nullptr); int start(const ControlList *controls = nullptr);
int stop(); int stop();
private: private:

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

@ -76,7 +76,7 @@ public:
virtual int exportFrameBuffers(Camera *camera, Stream *stream, virtual int exportFrameBuffers(Camera *camera, Stream *stream,
std::vector<std::unique_ptr<FrameBuffer>> *buffers) = 0; std::vector<std::unique_ptr<FrameBuffer>> *buffers) = 0;
virtual int start(Camera *camera, ControlList *controls) = 0; virtual int start(Camera *camera, const ControlList *controls) = 0;
virtual void stop(Camera *camera) = 0; virtual void stop(Camera *camera) = 0;
int queueRequest(Request *request); int queueRequest(Request *request);

2
src/libcamera/camera.cpp
View file

@ -1018,7 +1018,7 @@ int Camera::queueRequest(Request *request)
* \retval -ENODEV The camera has been disconnected from the system * \retval -ENODEV The camera has been disconnected from the system
* \retval -EACCES The camera is not in a state where it can be started * \retval -EACCES The camera is not in a state where it can be started
*/ */
int Camera::start(ControlList *controls) int Camera::start(const ControlList *controls)
{ {
Private *const d = LIBCAMERA_D_PTR(); Private *const d = LIBCAMERA_D_PTR();

4
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -126,7 +126,7 @@ public:
int exportFrameBuffers(Camera *camera, Stream *stream, int exportFrameBuffers(Camera *camera, Stream *stream,
std::vector<std::unique_ptr<FrameBuffer>> *buffers) override; std::vector<std::unique_ptr<FrameBuffer>> *buffers) override;
int start(Camera *camera, ControlList *controls) override; int start(Camera *camera, const ControlList *controls) override;
void stop(Camera *camera) override; void stop(Camera *camera) override;
int queueRequestDevice(Camera *camera, Request *request) override; int queueRequestDevice(Camera *camera, Request *request) override;
@ -652,7 +652,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)
return 0; return 0;
} }
int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] ControlList *controls) int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlList *controls)
{ {
std::map<uint32_t, ControlInfoMap> entityControls; std::map<uint32_t, ControlInfoMap> entityControls;
IPU3CameraData *data = cameraData(camera); IPU3CameraData *data = cameraData(camera);

4
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View file

@ -252,7 +252,7 @@ public:
int exportFrameBuffers(Camera *camera, Stream *stream, int exportFrameBuffers(Camera *camera, Stream *stream,
std::vector<std::unique_ptr<FrameBuffer>> *buffers) override; std::vector<std::unique_ptr<FrameBuffer>> *buffers) override;
int start(Camera *camera, ControlList *controls) override; int start(Camera *camera, const ControlList *controls) override;
void stop(Camera *camera) override; void stop(Camera *camera) override;
int queueRequestDevice(Camera *camera, Request *request) override; int queueRequestDevice(Camera *camera, Request *request) override;
@ -760,7 +760,7 @@ int PipelineHandlerRPi::exportFrameBuffers([[maybe_unused]] Camera *camera, Stre
return ret; return ret;
} }
int PipelineHandlerRPi::start(Camera *camera, ControlList *controls) int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)
{ {
RPiCameraData *data = cameraData(camera); RPiCameraData *data = cameraData(camera);
int ret; int ret;

4
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View file

@ -142,7 +142,7 @@ public:
int exportFrameBuffers(Camera *camera, Stream *stream, int exportFrameBuffers(Camera *camera, Stream *stream,
std::vector<std::unique_ptr<FrameBuffer>> *buffers) override; std::vector<std::unique_ptr<FrameBuffer>> *buffers) override;
int start(Camera *camera, ControlList *controls) override; int start(Camera *camera, const ControlList *controls) override;
void stop(Camera *camera) override; void stop(Camera *camera) override;
int queueRequestDevice(Camera *camera, Request *request) override; int queueRequestDevice(Camera *camera, Request *request) override;
@ -745,7 +745,7 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera)
return 0; return 0;
} }
int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *controls) int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlList *controls)
{ {
RkISP1CameraData *data = cameraData(camera); RkISP1CameraData *data = cameraData(camera);
int ret; int ret;

4
src/libcamera/pipeline/simple/simple.cpp
View file

@ -125,7 +125,7 @@ public:
int exportFrameBuffers(Camera *camera, Stream *stream, int exportFrameBuffers(Camera *camera, Stream *stream,
std::vector<std::unique_ptr<FrameBuffer>> *buffers) override; std::vector<std::unique_ptr<FrameBuffer>> *buffers) override;
int start(Camera *camera, ControlList *controls) override; int start(Camera *camera, const ControlList *controls) override;
void stop(Camera *camera) override; void stop(Camera *camera) override;
bool match(DeviceEnumerator *enumerator) override; bool match(DeviceEnumerator *enumerator) override;
@ -641,7 +641,7 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream,
return data->video_->exportBuffers(count, buffers); return data->video_->exportBuffers(count, buffers);
} }
int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] ControlList *controls) int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlList *controls)
{ {
SimpleCameraData *data = cameraData(camera); SimpleCameraData *data = cameraData(camera);
V4L2VideoDevice *video = data->video_; V4L2VideoDevice *video = data->video_;

4
src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
View file

@ -72,7 +72,7 @@ public:
int exportFrameBuffers(Camera *camera, Stream *stream, int exportFrameBuffers(Camera *camera, Stream *stream,
std::vector<std::unique_ptr<FrameBuffer>> *buffers) override; std::vector<std::unique_ptr<FrameBuffer>> *buffers) override;
int start(Camera *camera, ControlList *controls) override; int start(Camera *camera, const ControlList *controls) override;
void stop(Camera *camera) override; void stop(Camera *camera) override;
int queueRequestDevice(Camera *camera, Request *request) override; int queueRequestDevice(Camera *camera, Request *request) override;
@ -232,7 +232,7 @@ int PipelineHandlerUVC::exportFrameBuffers(Camera *camera, Stream *stream,
return data->video_->exportBuffers(count, buffers); return data->video_->exportBuffers(count, buffers);
} }
int PipelineHandlerUVC::start(Camera *camera, [[maybe_unused]] ControlList *controls) int PipelineHandlerUVC::start(Camera *camera, [[maybe_unused]] const ControlList *controls)
{ {
UVCCameraData *data = cameraData(camera); UVCCameraData *data = cameraData(camera);
unsigned int count = data->stream_.configuration().bufferCount; unsigned int count = data->stream_.configuration().bufferCount;

4
src/libcamera/pipeline/vimc/vimc.cpp
View file

@ -86,7 +86,7 @@ public:
int exportFrameBuffers(Camera *camera, Stream *stream, int exportFrameBuffers(Camera *camera, Stream *stream,
std::vector<std::unique_ptr<FrameBuffer>> *buffers) override; std::vector<std::unique_ptr<FrameBuffer>> *buffers) override;
int start(Camera *camera, ControlList *controls) override; int start(Camera *camera, const ControlList *controls) override;
void stop(Camera *camera) override; void stop(Camera *camera) override;
int queueRequestDevice(Camera *camera, Request *request) override; int queueRequestDevice(Camera *camera, Request *request) override;
@ -307,7 +307,7 @@ int PipelineHandlerVimc::exportFrameBuffers(Camera *camera, Stream *stream,
return data->video_->exportBuffers(count, buffers); return data->video_->exportBuffers(count, buffers);
} }
int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] ControlList *controls) int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] const ControlList *controls)
{ {
VimcCameraData *data = cameraData(camera); VimcCameraData *data = cameraData(camera);
unsigned int count = data->stream_.configuration().bufferCount; unsigned int count = data->stream_.configuration().bufferCount;