From 78d9f7bb75b3d900536a151b1b1a0a6e9ba84c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 4 Mar 2025 12:25:17 +0100 Subject: libcamera: pipeline: uvcvideo: Expose `Gamma` control MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 294ead848c3fa2 ("libcamera: Add gamma control id") introduced the "Gamma" control, so expose it for UVC cameras as well using the `V4L2_CID_GAMMA` control. Signed-off-by: Barnabás Pőcze Tested-by: Kieran Bingham Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src') diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index 5adc89fd..586e932d 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -329,6 +329,8 @@ int PipelineHandlerUVC::processControl(const UVCCameraData *data, ControlList *c cid = V4L2_CID_EXPOSURE_ABSOLUTE; else if (id == controls::AnalogueGain) cid = V4L2_CID_GAIN; + else if (id == controls::Gamma) + cid = V4L2_CID_GAMMA; else return -EINVAL; @@ -394,6 +396,10 @@ int PipelineHandlerUVC::processControl(const UVCCameraData *data, ControlList *c break; } + case V4L2_CID_GAMMA: + controls->set(cid, static_cast(std::lround(value.get() * 100))); + break; + default: { int32_t ivalue = value.get(); controls->set(cid, ivalue); @@ -691,6 +697,9 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info, case V4L2_CID_GAIN: id = &controls::AnalogueGain; break; + case V4L2_CID_GAMMA: + id = &controls::Gamma; + break; default: return; } @@ -845,6 +854,15 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info, break; } + case V4L2_CID_GAMMA: + /* UVC gamma is in units of 1/100 gamma. */ + info = ControlInfo{ + { min / 100.0f }, + { max / 100.0f }, + { def / 100.0f } + }; + break; + default: info = v4l2Info; break; -- cgit v1.2.1