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

libcamera: pipeline: uvcvideo: Handle controls during startup

Browse source 
Process the control list passed to `Camera::start()`, and set
the V4L2 controls accordingly.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Umang Jain <uajain@igalia.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Barnabás Pőcze 2025-05-22 13:06:02 +02:00
parent 5f94209b1d
commit 6b5cc1c92a
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,7 +100,7 @@ public:
private: private:
int processControl(const UVCCameraData *data, ControlList *controls, int processControl(const UVCCameraData *data, ControlList *controls,
unsigned int id, const ControlValue &value); unsigned int id, const ControlValue &value);
int processControls(UVCCameraData *data, Request *request); int processControls(UVCCameraData *data, const ControlList &reqControls);
bool acquireDevice(Camera *camera) override; bool acquireDevice(Camera *camera) override;
void releaseDevice(Camera *camera) override; void releaseDevice(Camera *camera) override;
@ -287,7 +287,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]] const ControlList *controls) int PipelineHandlerUVC::start(Camera *camera, 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;
@ -296,13 +296,22 @@ int PipelineHandlerUVC::start(Camera *camera, [[maybe_unused]] const ControlList
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = data->video_->streamOn(); if (controls) {
if (ret < 0) { ret = processControls(data, *controls);
data->video_->releaseBuffers(); if (ret < 0)
return ret; goto err_release_buffers;
} }
ret = data->video_->streamOn();
if (ret < 0)
goto err_release_buffers;
return 0; return 0;
err_release_buffers:
data->video_->releaseBuffers();
return ret;
} }
void PipelineHandlerUVC::stopDevice(Camera *camera) void PipelineHandlerUVC::stopDevice(Camera *camera)
@ -412,11 +421,11 @@ int PipelineHandlerUVC::processControl(const UVCCameraData *data, ControlList *c
return 0; return 0;
} }
int PipelineHandlerUVC::processControls(UVCCameraData *data, Request *request) int PipelineHandlerUVC::processControls(UVCCameraData *data, const ControlList &reqControls)
{ {
ControlList controls(data->video_->controls()); ControlList controls(data->video_->controls());
for (const auto &[id, value] : request->controls()) for (const auto &[id, value] : reqControls)
processControl(data, &controls, id, value); processControl(data, &controls, id, value);
for (const auto &ctrl : controls) for (const auto &ctrl : controls)
@ -444,7 +453,7 @@ int PipelineHandlerUVC::queueRequestDevice(Camera *camera, Request *request)
return -ENOENT; return -ENOENT;
} }
int ret = processControls(data, request); int ret = processControls(data, request->controls());
if (ret < 0) if (ret < 0)
return ret; return ret;